aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-11-22 00:55:11 +0100
committerMelanie2010-11-22 00:55:11 +0100
commit7e9a3019ac719b88defd69bded0f9b801194fe85 (patch)
treefcaf6c80793515084d199ec7c283066086d7bbf3 /OpenSim/Region
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-7e9a3019ac719b88defd69bded0f9b801194fe85.zip
opensim-SC_OLD-7e9a3019ac719b88defd69bded0f9b801194fe85.tar.gz
opensim-SC_OLD-7e9a3019ac719b88defd69bded0f9b801194fe85.tar.bz2
opensim-SC_OLD-7e9a3019ac719b88defd69bded0f9b801194fe85.tar.xz
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index a5e553c..294d4f0 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -134,6 +134,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
134 m_FreeswitchService = ServerUtils.LoadPlugin<IFreeswitchService>(serviceDll, args); 134 m_FreeswitchService = ServerUtils.LoadPlugin<IFreeswitchService>(serviceDll, args);
135 135
136 string jsonConfig = m_FreeswitchService.GetJsonConfig(); 136 string jsonConfig = m_FreeswitchService.GetJsonConfig();
137 m_log.Debug("[FreeSwitchVoice]: Configuration string: " + jsonConfig);
137 OSDMap map = (OSDMap)OSDParser.DeserializeJson(jsonConfig); 138 OSDMap map = (OSDMap)OSDParser.DeserializeJson(jsonConfig);
138 139
139 m_freeSwitchAPIPrefix = map["APIPrefix"].AsString(); 140 m_freeSwitchAPIPrefix = map["APIPrefix"].AsString();