diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 396d4c5..a30a38d 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -469,8 +469,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
469 | avatarName = avatar.Name; | 469 | avatarName = avatar.Name; |
470 | 470 | ||
471 | m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: scene = {0}, agentID = {1}", scene, agentID); | 471 | m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: scene = {0}, agentID = {1}", scene, agentID); |
472 | m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}", | 472 | // m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}", |
473 | request, path, param); | 473 | // request, path, param); |
474 | 474 | ||
475 | XmlElement resp; | 475 | XmlElement resp; |
476 | bool retry = false; | 476 | bool retry = false; |
@@ -577,7 +577,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
577 | 577 | ||
578 | string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse); | 578 | string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse); |
579 | 579 | ||
580 | m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r); | 580 | // m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r); |
581 | 581 | ||
582 | return r; | 582 | return r; |
583 | } | 583 | } |
@@ -625,8 +625,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
625 | // voice channel | 625 | // voice channel |
626 | LandData land = scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 626 | LandData land = scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
627 | 627 | ||
628 | m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", | 628 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", |
629 | scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); | 629 | // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); |
630 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: avatar \"{0}\": location: {1} {2} {3}", | 630 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: avatar \"{0}\": location: {1} {2} {3}", |
631 | // avatarName, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z); | 631 | // avatarName, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z); |
632 | 632 | ||
@@ -656,8 +656,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
656 | parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds); | 656 | parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds); |
657 | string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo); | 657 | string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo); |
658 | 658 | ||
659 | m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}", | 659 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}", |
660 | scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r); | 660 | // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r); |
661 | return r; | 661 | return r; |
662 | } | 662 | } |
663 | catch (Exception e) | 663 | catch (Exception e) |
@@ -684,11 +684,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
684 | public string ChatSessionRequest(Scene scene, string request, string path, string param, | 684 | public string ChatSessionRequest(Scene scene, string request, string path, string param, |
685 | UUID agentID, Caps caps) | 685 | UUID agentID, Caps caps) |
686 | { | 686 | { |
687 | ScenePresence avatar = scene.GetScenePresence(agentID); | 687 | // ScenePresence avatar = scene.GetScenePresence(agentID); |
688 | string avatarName = avatar.Name; | 688 | // string avatarName = avatar.Name; |
689 | 689 | ||
690 | m_log.DebugFormat("[VivoxVoice][CHATSESSION]: avatar \"{0}\": request: {1}, path: {2}, param: {3}", | 690 | // m_log.DebugFormat("[VivoxVoice][CHATSESSION]: avatar \"{0}\": request: {1}, path: {2}, param: {3}", |
691 | avatarName, request, path, param); | 691 | // avatarName, request, path, param); |
692 | return "<llsd>true</llsd>"; | 692 | return "<llsd>true</llsd>"; |
693 | } | 693 | } |
694 | 694 | ||
@@ -1119,7 +1119,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1119 | try | 1119 | try |
1120 | { | 1120 | { |
1121 | // Otherwise prepare the request | 1121 | // Otherwise prepare the request |
1122 | m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl); | 1122 | // m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl); |
1123 | 1123 | ||
1124 | HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl); | 1124 | HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl); |
1125 | HttpWebResponse rsp = null; | 1125 | HttpWebResponse rsp = null; |