diff options
Diffstat (limited to '')
5 files changed, 37 insertions, 30 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs index 535bf67..d56e39d 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | |||
@@ -184,7 +184,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
184 | hostPart.ParentGroup.RootPart.ScheduleFullUpdate(); | 184 | hostPart.ParentGroup.RootPart.ScheduleFullUpdate(); |
185 | } | 185 | } |
186 | 186 | ||
187 | return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, false, true) ? 1 : 0; | 187 | return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, false, true, true) ? 1 : 0; |
188 | } | 188 | } |
189 | } | 189 | } |
190 | } | 190 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs index 4e84364..026ceca 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs | |||
@@ -107,7 +107,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends | |||
107 | m_scene.AddCommand( | 107 | m_scene.AddCommand( |
108 | "Friends", this, "friends show", | 108 | "Friends", this, "friends show", |
109 | "friends show [--cache] <first-name> <last-name>", | 109 | "friends show [--cache] <first-name> <last-name>", |
110 | "Show the friends for the given user if they exist.\n", | 110 | "Show the friends for the given user if they exist.", |
111 | "The --cache option will show locally cached information for that user.", | 111 | "The --cache option will show locally cached information for that user.", |
112 | HandleFriendsShowCommand); | 112 | HandleFriendsShowCommand); |
113 | } | 113 | } |
@@ -197,4 +197,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends | |||
197 | } | 197 | } |
198 | } | 198 | } |
199 | } | 199 | } |
200 | } \ No newline at end of file | 200 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index ef1b92e..0cec959 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -575,7 +575,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
575 | 575 | ||
576 | public Hashtable FreeSwitchSLVoiceGetPreloginHTTPHandler(Hashtable request) | 576 | public Hashtable FreeSwitchSLVoiceGetPreloginHTTPHandler(Hashtable request) |
577 | { | 577 | { |
578 | m_log.Debug("[FreeSwitchVoice]: FreeSwitchSLVoiceGetPreloginHTTPHandler called"); | 578 | // m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceGetPreloginHTTPHandler called"); |
579 | 579 | ||
580 | Hashtable response = new Hashtable(); | 580 | Hashtable response = new Hashtable(); |
581 | response["content_type"] = "text/xml"; | 581 | response["content_type"] = "text/xml"; |
@@ -726,7 +726,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
726 | 726 | ||
727 | public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request) | 727 | public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request) |
728 | { | 728 | { |
729 | m_log.Debug("[FreeSwitchVoice]: FreeSwitchSLVoiceSigninHTTPHandler called"); | 729 | //m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceSigninHTTPHandler called"); |
730 | // string requestbody = (string)request["body"]; | 730 | // string requestbody = (string)request["body"]; |
731 | // string uri = (string)request["uri"]; | 731 | // string uri = (string)request["uri"]; |
732 | // string contenttype = (string)request["content-type"]; | 732 | // string contenttype = (string)request["content-type"]; |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index cb69411..e756c70 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -192,7 +192,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
192 | break; | 192 | break; |
193 | } | 193 | } |
194 | 194 | ||
195 | m_vivoxVoiceAccountApi = String.Format("http://{0}/api2", m_vivoxServer); | 195 | m_vivoxVoiceAccountApi = String.Format("https://{0}/api2", m_vivoxServer); |
196 | 196 | ||
197 | // Admin interface required values | 197 | // Admin interface required values |
198 | if (String.IsNullOrEmpty(m_vivoxServer) || | 198 | if (String.IsNullOrEmpty(m_vivoxServer) || |
@@ -471,8 +471,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
471 | avatarName = avatar.Name; | 471 | avatarName = avatar.Name; |
472 | 472 | ||
473 | m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: scene = {0}, agentID = {1}", scene, agentID); | 473 | m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: scene = {0}, agentID = {1}", scene, agentID); |
474 | m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}", | 474 | // m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}", |
475 | request, path, param); | 475 | // request, path, param); |
476 | 476 | ||
477 | XmlElement resp; | 477 | XmlElement resp; |
478 | bool retry = false; | 478 | bool retry = false; |
@@ -579,7 +579,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
579 | 579 | ||
580 | string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse); | 580 | string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse); |
581 | 581 | ||
582 | m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r); | 582 | // m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r); |
583 | 583 | ||
584 | return r; | 584 | return r; |
585 | } | 585 | } |
@@ -627,8 +627,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
627 | // voice channel | 627 | // voice channel |
628 | LandData land = scene.GetLandData(avatar.AbsolutePosition); | 628 | LandData land = scene.GetLandData(avatar.AbsolutePosition); |
629 | 629 | ||
630 | m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", | 630 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", |
631 | scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); | 631 | // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); |
632 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: avatar \"{0}\": location: {1} {2} {3}", | 632 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: avatar \"{0}\": location: {1} {2} {3}", |
633 | // avatarName, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z); | 633 | // avatarName, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z); |
634 | 634 | ||
@@ -658,8 +658,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
658 | parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds); | 658 | parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds); |
659 | string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo); | 659 | string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo); |
660 | 660 | ||
661 | m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}", | 661 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}", |
662 | scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r); | 662 | // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r); |
663 | return r; | 663 | return r; |
664 | } | 664 | } |
665 | catch (Exception e) | 665 | catch (Exception e) |
@@ -686,11 +686,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
686 | public string ChatSessionRequest(Scene scene, string request, string path, string param, | 686 | public string ChatSessionRequest(Scene scene, string request, string path, string param, |
687 | UUID agentID, Caps caps) | 687 | UUID agentID, Caps caps) |
688 | { | 688 | { |
689 | ScenePresence avatar = scene.GetScenePresence(agentID); | 689 | // ScenePresence avatar = scene.GetScenePresence(agentID); |
690 | string avatarName = avatar.Name; | 690 | // string avatarName = avatar.Name; |
691 | 691 | ||
692 | m_log.DebugFormat("[VivoxVoice][CHATSESSION]: avatar \"{0}\": request: {1}, path: {2}, param: {3}", | 692 | // m_log.DebugFormat("[VivoxVoice][CHATSESSION]: avatar \"{0}\": request: {1}, path: {2}, param: {3}", |
693 | avatarName, request, path, param); | 693 | // avatarName, request, path, param); |
694 | return "<llsd>true</llsd>"; | 694 | return "<llsd>true</llsd>"; |
695 | } | 695 | } |
696 | 696 | ||
@@ -740,7 +740,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
740 | return channelUri; | 740 | return channelUri; |
741 | } | 741 | } |
742 | 742 | ||
743 | private static readonly string m_vivoxLoginPath = "http://{0}/api2/viv_signin.php?userid={1}&pwd={2}"; | 743 | |
744 | private static readonly string m_vivoxLoginPath = "https://{0}/api2/viv_signin.php?userid={1}&pwd={2}"; | ||
744 | 745 | ||
745 | /// <summary> | 746 | /// <summary> |
746 | /// Perform administrative login for Vivox. | 747 | /// Perform administrative login for Vivox. |
@@ -752,7 +753,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
752 | return VivoxCall(requrl, false); | 753 | return VivoxCall(requrl, false); |
753 | } | 754 | } |
754 | 755 | ||
755 | private static readonly string m_vivoxLogoutPath = "http://{0}/api2/viv_signout.php?auth_token={1}"; | 756 | private static readonly string m_vivoxLogoutPath = "https://{0}/api2/viv_signout.php?auth_token={1}"; |
756 | 757 | ||
757 | /// <summary> | 758 | /// <summary> |
758 | /// Perform administrative logout for Vivox. | 759 | /// Perform administrative logout for Vivox. |
@@ -763,7 +764,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
763 | return VivoxCall(requrl, false); | 764 | return VivoxCall(requrl, false); |
764 | } | 765 | } |
765 | 766 | ||
766 | private static readonly string m_vivoxGetAccountPath = "http://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}"; | 767 | |
768 | private static readonly string m_vivoxGetAccountPath = "https://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}"; | ||
767 | 769 | ||
768 | /// <summary> | 770 | /// <summary> |
769 | /// Retrieve account information for the specified user. | 771 | /// Retrieve account information for the specified user. |
@@ -775,7 +777,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
775 | return VivoxCall(requrl, true); | 777 | return VivoxCall(requrl, true); |
776 | } | 778 | } |
777 | 779 | ||
778 | private static readonly string m_vivoxNewAccountPath = "http://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}"; | 780 | |
781 | private static readonly string m_vivoxNewAccountPath = "https://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}"; | ||
779 | 782 | ||
780 | /// <summary> | 783 | /// <summary> |
781 | /// Creates a new account. | 784 | /// Creates a new account. |
@@ -789,7 +792,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
789 | return VivoxCall(requrl, true); | 792 | return VivoxCall(requrl, true); |
790 | } | 793 | } |
791 | 794 | ||
792 | private static readonly string m_vivoxPasswordPath = "http://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}"; | 795 | |
796 | private static readonly string m_vivoxPasswordPath = "https://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}"; | ||
793 | 797 | ||
794 | /// <summary> | 798 | /// <summary> |
795 | /// Change the user's password. | 799 | /// Change the user's password. |
@@ -800,7 +804,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
800 | return VivoxCall(requrl, true); | 804 | return VivoxCall(requrl, true); |
801 | } | 805 | } |
802 | 806 | ||
803 | private static readonly string m_vivoxChannelPath = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}"; | 807 | |
808 | private static readonly string m_vivoxChannelPath = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}"; | ||
804 | 809 | ||
805 | /// <summary> | 810 | /// <summary> |
806 | /// Create a channel. | 811 | /// Create a channel. |
@@ -872,7 +877,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
872 | return false; | 877 | return false; |
873 | } | 878 | } |
874 | 879 | ||
875 | private static readonly string m_vivoxChannelSearchPath = "http://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}"; | 880 | private static readonly string m_vivoxChannelSearchPath = "https://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}"; |
876 | 881 | ||
877 | /// <summary> | 882 | /// <summary> |
878 | /// Retrieve a channel. | 883 | /// Retrieve a channel. |
@@ -1015,7 +1020,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1015 | return false; | 1020 | return false; |
1016 | } | 1021 | } |
1017 | 1022 | ||
1018 | // private static readonly string m_vivoxChannelById = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; | 1023 | // private static readonly string m_vivoxChannelById = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; |
1019 | 1024 | ||
1020 | // private XmlElement VivoxGetChannelById(string parent, string channelid) | 1025 | // private XmlElement VivoxGetChannelById(string parent, string channelid) |
1021 | // { | 1026 | // { |
@@ -1027,7 +1032,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1027 | // return VivoxCall(requrl, true); | 1032 | // return VivoxCall(requrl, true); |
1028 | // } | 1033 | // } |
1029 | 1034 | ||
1030 | private static readonly string m_vivoxChannelDel = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; | 1035 | private static readonly string m_vivoxChannelDel = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; |
1031 | 1036 | ||
1032 | /// <summary> | 1037 | /// <summary> |
1033 | /// Delete a channel. | 1038 | /// Delete a channel. |
@@ -1040,6 +1045,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1040 | /// are required in a later phase. | 1045 | /// are required in a later phase. |
1041 | /// In this case the call handles parent and description as optional values. | 1046 | /// In this case the call handles parent and description as optional values. |
1042 | /// </summary> | 1047 | /// </summary> |
1048 | |||
1043 | private XmlElement VivoxDeleteChannel(string parent, string channelid) | 1049 | private XmlElement VivoxDeleteChannel(string parent, string channelid) |
1044 | { | 1050 | { |
1045 | string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken); | 1051 | string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken); |
@@ -1050,11 +1056,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1050 | return VivoxCall(requrl, true); | 1056 | return VivoxCall(requrl, true); |
1051 | } | 1057 | } |
1052 | 1058 | ||
1053 | private static readonly string m_vivoxChannelSearch = "http://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}"; | 1059 | private static readonly string m_vivoxChannelSearch = "https://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}"; |
1054 | 1060 | ||
1055 | /// <summary> | 1061 | /// <summary> |
1056 | /// Return information on channels in the given directory | 1062 | /// Return information on channels in the given directory |
1057 | /// </summary> | 1063 | /// </summary> |
1064 | |||
1058 | private XmlElement VivoxListChildren(string channelid) | 1065 | private XmlElement VivoxListChildren(string channelid) |
1059 | { | 1066 | { |
1060 | string requrl = String.Format(m_vivoxChannelSearch, m_vivoxServer, channelid, m_authToken); | 1067 | string requrl = String.Format(m_vivoxChannelSearch, m_vivoxServer, channelid, m_authToken); |
@@ -1114,7 +1121,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1114 | try | 1121 | try |
1115 | { | 1122 | { |
1116 | // Otherwise prepare the request | 1123 | // Otherwise prepare the request |
1117 | m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl); | 1124 | // m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl); |
1118 | 1125 | ||
1119 | HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl); | 1126 | HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl); |
1120 | 1127 | ||
@@ -1314,4 +1321,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1314 | return false; | 1321 | return false; |
1315 | } | 1322 | } |
1316 | } | 1323 | } |
1317 | } \ No newline at end of file | 1324 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 29f9591..d764936 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -921,7 +921,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
921 | msg.dialog = dialog; | 921 | msg.dialog = dialog; |
922 | // msg.dialog = (byte)OpenMetaverse.InstantMessageDialog.GroupNotice; | 922 | // msg.dialog = (byte)OpenMetaverse.InstantMessageDialog.GroupNotice; |
923 | msg.fromGroup = true; | 923 | msg.fromGroup = true; |
924 | msg.offline = (byte)0; | 924 | msg.offline = (byte)1; // Allow this message to be stored for offline use |
925 | msg.ParentEstateID = 0; | 925 | msg.ParentEstateID = 0; |
926 | msg.Position = Vector3.Zero; | 926 | msg.Position = Vector3.Zero; |
927 | msg.RegionID = UUID.Zero.Guid; | 927 | msg.RegionID = UUID.Zero.Guid; |