Merge branch 'develop' of github.com:realXtend/taiga into develop

realXtend · May 19, 2010 · 4dc97b6 · 4dc97b6
2 parents 024c012 + 23938dc
commit 4dc97b6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/addon-modules/MumbleVoice/MumbleVoice.cs b/addon-modules/MumbleVoice/MumbleVoice.cs
@@ -29,6 +29,7 @@ public class MumbleVoiceModule : IRegionModule
         private string m_default_channel = "Root";
         private string m_context = "Mumbe voice system";
         private static string SERVICE_REST_URL = "/mumble_server_info";
+        private bool m_enabled = false;
 
         private List<Scene> m_scenes = new List<Scene>();
 
@@ -54,6 +55,7 @@ private void ReadConfig(IConfigSource source)
             {
                 if (source.Configs["mumblevoice"] != null)
                 {
+                    m_enabled = source.Configs["mumblevoice"].GetBoolean("enabled", false);
                     m_server_address = source.Configs["mumblevoice"].GetString("server_address", "");
                     m_server_password = source.Configs["mumblevoice"].GetString("server_password", "");
                     m_server_version = source.Configs["mumblevoice"].GetString("server_version", "");
@@ -71,9 +73,12 @@ private void ReadConfig(IConfigSource source)
 
         public void PostInitialise()
         {
-            foreach (Scene s in m_scenes)
+            if (m_enabled)
             {
-                s.EventManager.OnRegisterCaps += new EventManager.RegisterCapsEvent(EventManager_OnRegisterCaps);
+                foreach (Scene s in m_scenes)
+                {
+                    s.EventManager.OnRegisterCaps += new EventManager.RegisterCapsEvent(EventManager_OnRegisterCaps);
+                }
             }
         }
 
@@ -179,9 +184,12 @@ string GetRegionUuid(UUID userId)
 
         public void Close()
 	    {
-            foreach (Scene s in m_scenes)
+            if (m_enabled)
             {
-                s.EventManager.OnRegisterCaps -= new EventManager.RegisterCapsEvent(EventManager_OnRegisterCaps);
+                foreach (Scene s in m_scenes)
+                {
+                    s.EventManager.OnRegisterCaps -= new EventManager.RegisterCapsEvent(EventManager_OnRegisterCaps);
+                }
             }
 	    }
 

diff --git a/bin/addon-modules/MumbleVoice/config/mumblevoice.ini b/bin/addon-modules/MumbleVoice/config/mumblevoice.ini
@@ -1,6 +1,7 @@
 [mumblevoice]
- ; Mumble server configuration 
- server_address = world.realxtend.org
- server_password = server123
+ ; Mumble server configuration
+ enabled = false
+ server_address = your_murmurmur_server.com
+ server_password = your_password
  server_version = 1.2.2
- channel = voip
+ channel = your_channel