diff options
author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
---|---|---|
committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice | |
parent | Merge git://opensimulator.org/git/opensim (diff) | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 34d0e24..534bf92 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -121,16 +121,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
121 | m_config = config.Configs["VivoxVoice"]; | 121 | m_config = config.Configs["VivoxVoice"]; |
122 | 122 | ||
123 | if (null == m_config) | 123 | if (null == m_config) |
124 | { | ||
125 | m_log.Info("[VivoxVoice] no config found, plugin disabled"); | ||
126 | return; | 124 | return; |
127 | } | ||
128 | 125 | ||
129 | if (!m_config.GetBoolean("enabled", false)) | 126 | if (!m_config.GetBoolean("enabled", false)) |
130 | { | ||
131 | m_log.Info("[VivoxVoice] plugin disabled by configuration"); | ||
132 | return; | 127 | return; |
133 | } | ||
134 | 128 | ||
135 | try | 129 | try |
136 | { | 130 | { |
@@ -218,7 +212,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
218 | m_pluginEnabled = true; | 212 | m_pluginEnabled = true; |
219 | 213 | ||
220 | m_log.Info("[VivoxVoice] plugin enabled"); | 214 | m_log.Info("[VivoxVoice] plugin enabled"); |
221 | |||
222 | } | 215 | } |
223 | catch (Exception e) | 216 | catch (Exception e) |
224 | { | 217 | { |
@@ -228,7 +221,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
228 | } | 221 | } |
229 | } | 222 | } |
230 | 223 | ||
231 | |||
232 | // Called to indicate that the module has been added to the region | 224 | // Called to indicate that the module has been added to the region |
233 | public void AddRegion(Scene scene) | 225 | public void AddRegion(Scene scene) |
234 | { | 226 | { |