OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /var/git/opensim/

viewer-2-initial-appearance
opensim mirror account 2010-11-21 17:50:03 -08:00
parent c913f92f0f 8466ada8e0
commit f01e1094a3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
View File

@ -134,6 +134,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
m_FreeswitchService = ServerUtils.LoadPlugin<IFreeswitchService>(serviceDll, args); m_FreeswitchService = ServerUtils.LoadPlugin<IFreeswitchService>(serviceDll, args);
string jsonConfig = m_FreeswitchService.GetJsonConfig(); string jsonConfig = m_FreeswitchService.GetJsonConfig();
m_log.Debug("[FreeSwitchVoice]: Configuration string: " + jsonConfig);
OSDMap map = (OSDMap)OSDParser.DeserializeJson(jsonConfig); OSDMap map = (OSDMap)OSDParser.DeserializeJson(jsonConfig);
m_freeSwitchAPIPrefix = map["APIPrefix"].AsString(); m_freeSwitchAPIPrefix = map["APIPrefix"].AsString();

5
OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs
View File

@ -54,7 +54,7 @@ namespace OpenSim.Services.Connectors
public RemoteFreeswitchConnector(string serverURI) public RemoteFreeswitchConnector(string serverURI)
{ {
m_ServerURI = Path.Combine(serverURI.TrimEnd('/'), "region-config"); m_ServerURI = serverURI.TrimEnd('/') + "/region-config";
} }
public RemoteFreeswitchConnector(IConfigSource source) public RemoteFreeswitchConnector(IConfigSource source)
@ -79,7 +79,7 @@ namespace OpenSim.Services.Connectors
m_log.Error("[FREESWITCH CONNECTOR]: No FreeswitchServiceURL named in section FreeSwitchVoice"); m_log.Error("[FREESWITCH CONNECTOR]: No FreeswitchServiceURL named in section FreeSwitchVoice");
throw new Exception("Freeswitch connector init error"); throw new Exception("Freeswitch connector init error");
} }
m_ServerURI = serviceURI; m_ServerURI = serviceURI.TrimEnd('/') + "/region-config";
} }
public Hashtable HandleDirectoryRequest(Hashtable requestBody) public Hashtable HandleDirectoryRequest(Hashtable requestBody)
@ -96,6 +96,7 @@ namespace OpenSim.Services.Connectors
public string GetJsonConfig() public string GetJsonConfig()
{ {
m_log.DebugFormat("[FREESWITCH CONNECTOR]: Requesting config from {0}", m_ServerURI);
return SynchronousRestFormsRequester.MakeRequest("GET", return SynchronousRestFormsRequester.MakeRequest("GET",
m_ServerURI, String.Empty); m_ServerURI, String.Empty);
} }