aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/VoiceChat/VoiceChatServer.cs15
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/VoiceChat/VoiceChatServer.cs b/OpenSim/Region/Environment/Modules/VoiceChat/VoiceChatServer.cs
index 3f6e346..ad42216 100644
--- a/OpenSim/Region/Environment/Modules/VoiceChat/VoiceChatServer.cs
+++ b/OpenSim/Region/Environment/Modules/VoiceChat/VoiceChatServer.cs
@@ -34,18 +34,21 @@ namespace OpenSim.Region.Environment.Modules.VoiceChat
34 34
35 public void Initialise(Scene scene, Nini.Config.IConfigSource source) 35 public void Initialise(Scene scene, Nini.Config.IConfigSource source)
36 { 36 {
37 if (!m_scenes.Contains(scene))
38 m_scenes.Add(scene);
39
40 scene.EventManager.OnNewClient += NewClient;
41 scene.EventManager.OnRemovePresence += RemovePresence;
42
43 try 37 try
44 { 38 {
45 m_enabled = source.Configs["Voice"].GetBoolean("enabled", m_enabled); 39 m_enabled = source.Configs["Voice"].GetBoolean("enabled", m_enabled);
46 } 40 }
47 catch (Exception) 41 catch (Exception)
48 { } 42 { }
43
44 if (m_enabled)
45 {
46 if (!m_scenes.Contains(scene))
47 m_scenes.Add(scene);
48
49 scene.EventManager.OnNewClient += NewClient;
50 scene.EventManager.OnRemovePresence += RemovePresence;
51 }
49 } 52 }
50 53
51 public void PostInitialise() 54 public void PostInitialise()