diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 8 |
2 files changed, 0 insertions, 14 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 | { |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 5ba4033..ae902eb 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 | { |