aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoropensim mirror account2010-11-21 17:50:03 -0800
committeropensim mirror account2010-11-21 17:50:03 -0800
commitf01e1094a361aa4ce10f6f6d7b5deecf3d4b1c87 (patch)
tree1ad6665b23863060d4ba1c1a91cae4f33f017a38
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-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/
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs1
-rw-r--r--OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs5
2 files changed, 4 insertions, 2 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();
diff --git a/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs b/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs
index d63d99d..c9bba0b 100644
--- a/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs
+++ b/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Services.Connectors
54 54
55 public RemoteFreeswitchConnector(string serverURI) 55 public RemoteFreeswitchConnector(string serverURI)
56 { 56 {
57 m_ServerURI = Path.Combine(serverURI.TrimEnd('/'), "region-config"); 57 m_ServerURI = serverURI.TrimEnd('/') + "/region-config";
58 } 58 }
59 59
60 public RemoteFreeswitchConnector(IConfigSource source) 60 public RemoteFreeswitchConnector(IConfigSource source)
@@ -79,7 +79,7 @@ namespace OpenSim.Services.Connectors
79 m_log.Error("[FREESWITCH CONNECTOR]: No FreeswitchServiceURL named in section FreeSwitchVoice"); 79 m_log.Error("[FREESWITCH CONNECTOR]: No FreeswitchServiceURL named in section FreeSwitchVoice");
80 throw new Exception("Freeswitch connector init error"); 80 throw new Exception("Freeswitch connector init error");
81 } 81 }
82 m_ServerURI = serviceURI; 82 m_ServerURI = serviceURI.TrimEnd('/') + "/region-config";
83 } 83 }
84 84
85 public Hashtable HandleDirectoryRequest(Hashtable requestBody) 85 public Hashtable HandleDirectoryRequest(Hashtable requestBody)
@@ -96,6 +96,7 @@ namespace OpenSim.Services.Connectors
96 96
97 public string GetJsonConfig() 97 public string GetJsonConfig()
98 { 98 {
99 m_log.DebugFormat("[FREESWITCH CONNECTOR]: Requesting config from {0}", m_ServerURI);
99 return SynchronousRestFormsRequester.MakeRequest("GET", 100 return SynchronousRestFormsRequester.MakeRequest("GET",
100 m_ServerURI, String.Empty); 101 m_ServerURI, String.Empty);
101 } 102 }