diff options
| author | opensim mirror account | 2010-11-21 17:50:03 -0800 |
|---|---|---|
| committer | opensim mirror account | 2010-11-21 17:50:03 -0800 |
| commit | f01e1094a361aa4ce10f6f6d7b5deecf3d4b1c87 (patch) | |
| tree | 1ad6665b23863060d4ba1c1a91cae4f33f017a38 /OpenSim/Region | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-f01e1094a361aa4ce10f6f6d7b5deecf3d4b1c87.zip opensim-SC_OLD-f01e1094a361aa4ce10f6f6d7b5deecf3d4b1c87.tar.gz opensim-SC_OLD-f01e1094a361aa4ce10f6f6d7b5deecf3d4b1c87.tar.bz2 opensim-SC_OLD-f01e1094a361aa4ce10f6f6d7b5deecf3d4b1c87.tar.xz | |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 1 |
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(); |