aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice
diff options
context:
space:
mode:
authorMelanie2011-04-03 14:16:28 +0100
committerMelanie2011-04-03 14:16:28 +0100
commit15e0b55e66b7906f4b45f4e0a8761d5c5315668c (patch)
treed4a8f9862f8daa8dbf383d3b20ad102aea138c71 /OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice
parentMerge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff)
parentComment out some startup logging lines to make up for the one I added earlier... (diff)
downloadopensim-SC_OLD-15e0b55e66b7906f4b45f4e0a8761d5c5315668c.zip
opensim-SC_OLD-15e0b55e66b7906f4b45f4e0a8761d5c5315668c.tar.gz
opensim-SC_OLD-15e0b55e66b7906f4b45f4e0a8761d5c5315668c.tar.bz2
opensim-SC_OLD-15e0b55e66b7906f4b45f4e0a8761d5c5315668c.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs6
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 7deb32f..0e679a9 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -106,16 +106,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
106 m_Config = config.Configs["FreeSwitchVoice"]; 106 m_Config = config.Configs["FreeSwitchVoice"];
107 107
108 if (m_Config == null) 108 if (m_Config == null)
109 {
110 m_log.Info("[FreeSwitchVoice] no config found, plugin disabled");
111 return; 109 return;
112 }
113 110
114 if (!m_Config.GetBoolean("Enabled", false)) 111 if (!m_Config.GetBoolean("Enabled", false))
115 {
116 m_log.Info("[FreeSwitchVoice] plugin disabled by configuration");
117 return; 112 return;
118 }
119 113
120 try 114 try
121 { 115 {