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/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs | |
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/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs | 5 |
1 files changed, 3 insertions, 2 deletions
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 | } |