diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index a583cca..e9c5453 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -132,7 +132,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
132 | m_FreeswitchService = ServerUtils.LoadPlugin<IFreeswitchService>(serviceDll, args); | 132 | m_FreeswitchService = ServerUtils.LoadPlugin<IFreeswitchService>(serviceDll, args); |
133 | 133 | ||
134 | string jsonConfig = m_FreeswitchService.GetJsonConfig(); | 134 | string jsonConfig = m_FreeswitchService.GetJsonConfig(); |
135 | m_log.Debug("[FreeSwitchVoice]: Configuration string: " + jsonConfig); | 135 | //m_log.Debug("[FreeSwitchVoice]: Configuration string: " + jsonConfig); |
136 | OSDMap map = (OSDMap)OSDParser.DeserializeJson(jsonConfig); | 136 | OSDMap map = (OSDMap)OSDParser.DeserializeJson(jsonConfig); |
137 | 137 | ||
138 | m_freeSwitchAPIPrefix = map["APIPrefix"].AsString(); | 138 | m_freeSwitchAPIPrefix = map["APIPrefix"].AsString(); |
@@ -363,8 +363,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
363 | 363 | ||
364 | try | 364 | try |
365 | { | 365 | { |
366 | m_log.DebugFormat("[FreeSwitchVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}", | 366 | //m_log.DebugFormat("[FreeSwitchVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}", |
367 | request, path, param); | 367 | // request, path, param); |
368 | 368 | ||
369 | //XmlElement resp; | 369 | //XmlElement resp; |
370 | string agentname = "x" + Convert.ToBase64String(agentID.GetBytes()); | 370 | string agentname = "x" + Convert.ToBase64String(agentID.GetBytes()); |
@@ -445,8 +445,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
445 | // voice channel | 445 | // voice channel |
446 | LandData land = scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 446 | LandData land = scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
447 | 447 | ||
448 | m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", | 448 | //m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", |
449 | scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); | 449 | // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); |
450 | 450 | ||
451 | // TODO: EstateSettings don't seem to get propagated... | 451 | // TODO: EstateSettings don't seem to get propagated... |
452 | // if (!scene.RegionInfo.EstateSettings.AllowVoice) | 452 | // if (!scene.RegionInfo.EstateSettings.AllowVoice) |
@@ -592,7 +592,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
592 | 592 | ||
593 | response["int_response_code"] = 200; | 593 | response["int_response_code"] = 200; |
594 | 594 | ||
595 | m_log.DebugFormat("[FreeSwitchVoice] FreeSwitchSLVoiceGetPreloginHTTPHandler return {0}",response["str_response_string"]); | 595 | //m_log.DebugFormat("[FreeSwitchVoice] FreeSwitchSLVoiceGetPreloginHTTPHandler return {0}",response["str_response_string"]); |
596 | return response; | 596 | return response; |
597 | } | 597 | } |
598 | 598 | ||
@@ -664,7 +664,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
664 | response["str_response_string"] = resp.ToString(); | 664 | response["str_response_string"] = resp.ToString(); |
665 | Regex normalizeEndLines = new Regex(@"\r\n", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.Multiline); | 665 | Regex normalizeEndLines = new Regex(@"\r\n", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.Multiline); |
666 | 666 | ||
667 | m_log.DebugFormat("[FREESWITCH]: {0}", normalizeEndLines.Replace((string)response["str_response_string"],"")); | 667 | //m_log.DebugFormat("[FREESWITCH]: {0}", normalizeEndLines.Replace((string)response["str_response_string"],"")); |
668 | return response; | 668 | return response; |
669 | } | 669 | } |
670 | 670 | ||
@@ -696,8 +696,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
696 | } | 696 | } |
697 | } | 697 | } |
698 | 698 | ||
699 | m_log.DebugFormat("[FreeSwitchVoice]: AUTH, URI: {0}, Content-Type:{1}, Body{2}", uri, contenttype, | 699 | //m_log.DebugFormat("[FreeSwitchVoice]: AUTH, URI: {0}, Content-Type:{1}, Body{2}", uri, contenttype, |
700 | requestbody); | 700 | // requestbody); |
701 | Hashtable response = new Hashtable(); | 701 | Hashtable response = new Hashtable(); |
702 | response["str_response_string"] = string.Format(@"<response xsi:schemaLocation=""/xsd/signin.xsd""> | 702 | response["str_response_string"] = string.Format(@"<response xsi:schemaLocation=""/xsd/signin.xsd""> |
703 | <level0> | 703 | <level0> |