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

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
                 m_FreeswitchService = ServerUtils.LoadPlugin<IFreeswitchService>(serviceDll, args);
 
                 string jsonConfig = m_FreeswitchService.GetJsonConfig();
+                m_log.Debug("[FreeSwitchVoice]: Configuration string: " + jsonConfig);
                 OSDMap map = (OSDMap)OSDParser.DeserializeJson(jsonConfig);
 
                 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
 
         public RemoteFreeswitchConnector(string serverURI)
         {
-            m_ServerURI = Path.Combine(serverURI.TrimEnd('/'), "region-config");
+            m_ServerURI = serverURI.TrimEnd('/') + "/region-config";
         }
 
         public RemoteFreeswitchConnector(IConfigSource source)
@@ -79,7 +79,7 @@ namespace OpenSim.Services.Connectors
                 m_log.Error("[FREESWITCH CONNECTOR]: No FreeswitchServiceURL named in section FreeSwitchVoice");
                 throw new Exception("Freeswitch connector init error");
             }
-            m_ServerURI = serviceURI;
+            m_ServerURI = serviceURI.TrimEnd('/') + "/region-config";
         }
 
         public Hashtable HandleDirectoryRequest(Hashtable requestBody)
@@ -96,6 +96,7 @@ namespace OpenSim.Services.Connectors
 
         public string GetJsonConfig()
         {
+            m_log.DebugFormat("[FREESWITCH CONNECTOR]: Requesting config from {0}", m_ServerURI);
             return SynchronousRestFormsRequester.MakeRequest("GET",
                     m_ServerURI, String.Empty);
         }