diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules')
12 files changed, 149 insertions, 99 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 915ebd8..686c605 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -670,6 +670,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
670 | public event ObjectDrop OnObjectDrop; | 670 | public event ObjectDrop OnObjectDrop; |
671 | public event StartAnim OnStartAnim; | 671 | public event StartAnim OnStartAnim; |
672 | public event StopAnim OnStopAnim; | 672 | public event StopAnim OnStopAnim; |
673 | public event ChangeAnim OnChangeAnim; | ||
673 | public event LinkObjects OnLinkObjects; | 674 | public event LinkObjects OnLinkObjects; |
674 | public event DelinkObjects OnDelinkObjects; | 675 | public event DelinkObjects OnDelinkObjects; |
675 | public event RequestMapBlocks OnRequestMapBlocks; | 676 | public event RequestMapBlocks OnRequestMapBlocks; |
@@ -715,6 +716,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
715 | public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; | 716 | public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; |
716 | public event UpdatePrimFlags OnUpdatePrimFlags; | 717 | public event UpdatePrimFlags OnUpdatePrimFlags; |
717 | public event UpdatePrimTexture OnUpdatePrimTexture; | 718 | public event UpdatePrimTexture OnUpdatePrimTexture; |
719 | public event ClientChangeObject onClientChangeObject; | ||
718 | public event UpdateVector OnUpdatePrimGroupPosition; | 720 | public event UpdateVector OnUpdatePrimGroupPosition; |
719 | public event UpdateVector OnUpdatePrimSinglePosition; | 721 | public event UpdateVector OnUpdatePrimSinglePosition; |
720 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; | 722 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; |
@@ -819,6 +821,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
819 | public event ObjectOwner OnObjectOwner; | 821 | public event ObjectOwner OnObjectOwner; |
820 | public event DirPlacesQuery OnDirPlacesQuery; | 822 | public event DirPlacesQuery OnDirPlacesQuery; |
821 | public event DirFindQuery OnDirFindQuery; | 823 | public event DirFindQuery OnDirFindQuery; |
824 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | ||
822 | public event DirLandQuery OnDirLandQuery; | 825 | public event DirLandQuery OnDirLandQuery; |
823 | public event DirPopularQuery OnDirPopularQuery; | 826 | public event DirPopularQuery OnDirPopularQuery; |
824 | public event DirClassifiedQuery OnDirClassifiedQuery; | 827 | public event DirClassifiedQuery OnDirClassifiedQuery; |
@@ -835,7 +838,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
835 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; | 838 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; |
836 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; | 839 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; |
837 | public event ClassifiedDelete OnClassifiedDelete; | 840 | public event ClassifiedDelete OnClassifiedDelete; |
838 | public event ClassifiedDelete OnClassifiedGodDelete; | 841 | public event ClassifiedGodDelete OnClassifiedGodDelete; |
839 | public event EventNotificationAddRequest OnEventNotificationAddRequest; | 842 | public event EventNotificationAddRequest OnEventNotificationAddRequest; |
840 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; | 843 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; |
841 | public event EventGodDelete OnEventGodDelete; | 844 | public event EventGodDelete OnEventGodDelete; |
@@ -865,10 +868,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
865 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 868 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
866 | public event SimWideDeletesDelegate OnSimWideDeletes; | 869 | public event SimWideDeletesDelegate OnSimWideDeletes; |
867 | public event SendPostcard OnSendPostcard; | 870 | public event SendPostcard OnSendPostcard; |
871 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
868 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 872 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
869 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 873 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
870 | public event GodlikeMessage onGodlikeMessage; | 874 | public event GodlikeMessage onGodlikeMessage; |
871 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; | 875 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
876 | public event GenericCall2 OnUpdateThrottles; | ||
872 | 877 | ||
873 | #pragma warning restore 67 | 878 | #pragma warning restore 67 |
874 | 879 | ||
@@ -886,10 +891,10 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
886 | 891 | ||
887 | public void Close() | 892 | public void Close() |
888 | { | 893 | { |
889 | Close(false); | 894 | Close(true, false); |
890 | } | 895 | } |
891 | 896 | ||
892 | public void Close(bool force) | 897 | public void Close(bool sendStop, bool force) |
893 | { | 898 | { |
894 | Disconnect(); | 899 | Disconnect(); |
895 | } | 900 | } |
@@ -906,7 +911,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
906 | // Mimicking LLClientView which gets always set appearance from client. | 911 | // Mimicking LLClientView which gets always set appearance from client. |
907 | AvatarAppearance appearance; | 912 | AvatarAppearance appearance; |
908 | m_scene.GetAvatarAppearance(this, out appearance); | 913 | m_scene.GetAvatarAppearance(this, out appearance); |
909 | OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone()); | 914 | OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone(),appearance.AvatarSize, new WearableCacheItem[0]); |
910 | } | 915 | } |
911 | 916 | ||
912 | public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) | 917 | public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) |
@@ -1097,7 +1102,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1097 | 1102 | ||
1098 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId) | 1103 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId) |
1099 | { | 1104 | { |
1100 | 1105 | ||
1106 | } | ||
1107 | |||
1108 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId) | ||
1109 | { | ||
1110 | |||
1101 | } | 1111 | } |
1102 | 1112 | ||
1103 | public void SendRemoveInventoryItem(UUID itemID) | 1113 | public void SendRemoveInventoryItem(UUID itemID) |
@@ -1120,7 +1130,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1120 | 1130 | ||
1121 | } | 1131 | } |
1122 | 1132 | ||
1123 | public void SendXferPacket(ulong xferID, uint packet, byte[] data) | 1133 | public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory) |
1124 | { | 1134 | { |
1125 | 1135 | ||
1126 | } | 1136 | } |
@@ -1419,6 +1429,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1419 | 1429 | ||
1420 | } | 1430 | } |
1421 | 1431 | ||
1432 | public void SetAgentThrottleSilent(int throttle, int setting) | ||
1433 | { | ||
1434 | |||
1435 | |||
1436 | } | ||
1422 | public byte[] GetThrottlesPacked(float multiplier) | 1437 | public byte[] GetThrottlesPacked(float multiplier) |
1423 | { | 1438 | { |
1424 | return new byte[0]; | 1439 | return new byte[0]; |
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; |
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs index a6d43f1..a375da9 100644 --- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs +++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | |||
@@ -122,28 +122,40 @@ namespace OpenSim.Region.OptionalModules | |||
122 | 122 | ||
123 | private bool CanObjectEnter(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene) | 123 | private bool CanObjectEnter(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene) |
124 | { | 124 | { |
125 | if (newPoint.X < -1f || newPoint.X > (float)(Constants.RegionSize + 1) || | ||
126 | newPoint.Y < -1f || newPoint.Y > (float)(Constants.RegionSize + 1)) | ||
127 | return true; | ||
128 | |||
125 | SceneObjectPart obj = scene.GetSceneObjectPart(objectID); | 129 | SceneObjectPart obj = scene.GetSceneObjectPart(objectID); |
126 | Vector3 oldPoint = obj.GroupPosition; | 130 | |
127 | int objectCount = obj.ParentGroup.PrimCount; | 131 | if (obj == null) |
128 | ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y); | 132 | return false; |
133 | |||
134 | // Prim counts are determined by the location of the root prim. if we're | ||
135 | // moving a child prim, just let it pass | ||
136 | if (!obj.IsRoot) | ||
137 | { | ||
138 | return true; | ||
139 | } | ||
140 | |||
129 | ILandObject newParcel = scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y); | 141 | ILandObject newParcel = scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y); |
130 | 142 | ||
131 | int usedPrims = newParcel.PrimCounts.Total; | 143 | if (newParcel == null) |
132 | int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount(); | 144 | return true; |
145 | |||
146 | Vector3 oldPoint = obj.GroupPosition; | ||
147 | ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y); | ||
133 | 148 | ||
134 | // The prim hasn't crossed a region boundry so we don't need to worry | 149 | // The prim hasn't crossed a region boundry so we don't need to worry |
135 | // about prim counts here | 150 | // about prim counts here |
136 | if(oldParcel.Equals(newParcel)) | 151 | if(oldParcel != null && oldParcel.Equals(newParcel)) |
137 | { | 152 | { |
138 | return true; | 153 | return true; |
139 | } | 154 | } |
140 | 155 | ||
141 | // Prim counts are determined by the location of the root prim. if we're | 156 | int objectCount = obj.ParentGroup.PrimCount; |
142 | // moving a child prim, just let it pass | 157 | int usedPrims = newParcel.PrimCounts.Total; |
143 | if(!obj.IsRoot) | 158 | int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount(); |
144 | { | ||
145 | return true; | ||
146 | } | ||
147 | 159 | ||
148 | // TODO: Add Special Case here for temporary prims | 160 | // TODO: Add Special Case here for temporary prims |
149 | 161 | ||
@@ -172,4 +184,4 @@ namespace OpenSim.Region.OptionalModules | |||
172 | return true; | 184 | return true; |
173 | } | 185 | } |
174 | } | 186 | } |
175 | } \ No newline at end of file | 187 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs index 943675e..32549d6 100644 --- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs | |||
@@ -98,7 +98,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule | |||
98 | 98 | ||
99 | public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri) | 99 | public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri) |
100 | { | 100 | { |
101 | scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] {uri}); | 101 | if (m_Enabled) |
102 | { | ||
103 | scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] { uri }); | ||
104 | } | ||
102 | } | 105 | } |
103 | 106 | ||
104 | public void UnRegisterReceiver(string channelID, UUID itemID) | 107 | public void UnRegisterReceiver(string channelID, UUID itemID) |
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 7bbf500..57d9217 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
@@ -198,7 +198,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
198 | { | 198 | { |
199 | } | 199 | } |
200 | 200 | ||
201 | public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount) | 201 | public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount, UUID txn) |
202 | { | 202 | { |
203 | string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID)); | 203 | string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID)); |
204 | 204 | ||
@@ -840,6 +840,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
840 | if (module != null) | 840 | if (module != null) |
841 | module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice); | 841 | module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice); |
842 | } | 842 | } |
843 | |||
844 | public void MoveMoney(UUID fromAgentID, UUID toAgentID, int amount, string text) | ||
845 | { | ||
846 | } | ||
843 | } | 847 | } |
844 | 848 | ||
845 | public enum TransactionType : int | 849 | public enum TransactionType : int |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 0ee00e9..7918c22 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
47 | private readonly string m_firstname; | 47 | private readonly string m_firstname; |
48 | private readonly string m_lastname; | 48 | private readonly string m_lastname; |
49 | private readonly Vector3 m_startPos; | 49 | private readonly Vector3 m_startPos; |
50 | private readonly UUID m_uuid = UUID.Random(); | 50 | private UUID m_uuid = UUID.Random(); |
51 | private readonly Scene m_scene; | 51 | private readonly Scene m_scene; |
52 | private readonly UUID m_ownerID; | 52 | private readonly UUID m_ownerID; |
53 | 53 | ||
@@ -221,7 +221,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
221 | #pragma warning disable 67 | 221 | #pragma warning disable 67 |
222 | public event Action<IClientAPI> OnLogout; | 222 | public event Action<IClientAPI> OnLogout; |
223 | public event ObjectPermissions OnObjectPermissions; | 223 | public event ObjectPermissions OnObjectPermissions; |
224 | 224 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | |
225 | public event MoneyTransferRequest OnMoneyTransferRequest; | 225 | public event MoneyTransferRequest OnMoneyTransferRequest; |
226 | public event ParcelBuy OnParcelBuy; | 226 | public event ParcelBuy OnParcelBuy; |
227 | public event Action<IClientAPI> OnConnectionClosed; | 227 | public event Action<IClientAPI> OnConnectionClosed; |
@@ -241,6 +241,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
241 | public event ObjectDrop OnObjectDrop; | 241 | public event ObjectDrop OnObjectDrop; |
242 | public event StartAnim OnStartAnim; | 242 | public event StartAnim OnStartAnim; |
243 | public event StopAnim OnStopAnim; | 243 | public event StopAnim OnStopAnim; |
244 | public event ChangeAnim OnChangeAnim; | ||
244 | public event LinkObjects OnLinkObjects; | 245 | public event LinkObjects OnLinkObjects; |
245 | public event DelinkObjects OnDelinkObjects; | 246 | public event DelinkObjects OnDelinkObjects; |
246 | public event RequestMapBlocks OnRequestMapBlocks; | 247 | public event RequestMapBlocks OnRequestMapBlocks; |
@@ -290,6 +291,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
290 | public event UpdatePrimTexture OnUpdatePrimTexture; | 291 | public event UpdatePrimTexture OnUpdatePrimTexture; |
291 | public event UpdateVector OnUpdatePrimGroupPosition; | 292 | public event UpdateVector OnUpdatePrimGroupPosition; |
292 | public event UpdateVector OnUpdatePrimSinglePosition; | 293 | public event UpdateVector OnUpdatePrimSinglePosition; |
294 | public event ClientChangeObject onClientChangeObject; | ||
293 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; | 295 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; |
294 | public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition; | 296 | public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition; |
295 | public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; | 297 | public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; |
@@ -427,7 +429,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
427 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; | 429 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; |
428 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; | 430 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; |
429 | public event ClassifiedDelete OnClassifiedDelete; | 431 | public event ClassifiedDelete OnClassifiedDelete; |
430 | public event ClassifiedDelete OnClassifiedGodDelete; | 432 | public event ClassifiedGodDelete OnClassifiedGodDelete; |
431 | 433 | ||
432 | public event EventNotificationAddRequest OnEventNotificationAddRequest; | 434 | public event EventNotificationAddRequest OnEventNotificationAddRequest; |
433 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; | 435 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; |
@@ -466,11 +468,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
466 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 468 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
467 | public event SimWideDeletesDelegate OnSimWideDeletes; | 469 | public event SimWideDeletesDelegate OnSimWideDeletes; |
468 | public event SendPostcard OnSendPostcard; | 470 | public event SendPostcard OnSendPostcard; |
471 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
469 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 472 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
470 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 473 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
471 | public event GodlikeMessage onGodlikeMessage; | 474 | public event GodlikeMessage onGodlikeMessage; |
472 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; | 475 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
473 | 476 | public event GenericCall2 OnUpdateThrottles; | |
474 | #pragma warning restore 67 | 477 | #pragma warning restore 67 |
475 | 478 | ||
476 | #endregion | 479 | #endregion |
@@ -493,6 +496,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
493 | public virtual UUID AgentId | 496 | public virtual UUID AgentId |
494 | { | 497 | { |
495 | get { return m_uuid; } | 498 | get { return m_uuid; } |
499 | set { m_uuid = value; } | ||
496 | } | 500 | } |
497 | 501 | ||
498 | public UUID SessionId | 502 | public UUID SessionId |
@@ -593,6 +597,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
593 | public virtual void SetChildAgentThrottle(byte[] throttle) | 597 | public virtual void SetChildAgentThrottle(byte[] throttle) |
594 | { | 598 | { |
595 | } | 599 | } |
600 | |||
601 | public void SetAgentThrottleSilent(int throttle, int setting) | ||
602 | { | ||
603 | |||
604 | |||
605 | } | ||
596 | public byte[] GetThrottlesPacked(float multiplier) | 606 | public byte[] GetThrottlesPacked(float multiplier) |
597 | { | 607 | { |
598 | return new byte[0]; | 608 | return new byte[0]; |
@@ -737,6 +747,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
737 | { | 747 | { |
738 | } | 748 | } |
739 | 749 | ||
750 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId) | ||
751 | { | ||
752 | } | ||
753 | |||
740 | public virtual void SendRemoveInventoryItem(UUID itemID) | 754 | public virtual void SendRemoveInventoryItem(UUID itemID) |
741 | { | 755 | { |
742 | } | 756 | } |
@@ -753,7 +767,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
753 | { | 767 | { |
754 | } | 768 | } |
755 | 769 | ||
756 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) | 770 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory) |
757 | { | 771 | { |
758 | } | 772 | } |
759 | public virtual void SendAbortXferPacket(ulong xferID) | 773 | public virtual void SendAbortXferPacket(ulong xferID) |
@@ -903,10 +917,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
903 | 917 | ||
904 | public void Close() | 918 | public void Close() |
905 | { | 919 | { |
906 | Close(false); | 920 | Close(true, false); |
907 | } | 921 | } |
908 | 922 | ||
909 | public void Close(bool force) | 923 | public void Close(bool sendStop, bool force) |
910 | { | 924 | { |
911 | // Remove ourselves from the scene | 925 | // Remove ourselves from the scene |
912 | m_scene.RemoveClient(AgentId, false); | 926 | m_scene.RemoveClient(AgentId, false); |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index 7d46d92..8c9c006 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
@@ -143,10 +143,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
143 | npcAvatar.CircuitCode = (uint)Util.RandomClass.Next(0, | 143 | npcAvatar.CircuitCode = (uint)Util.RandomClass.Next(0, |
144 | int.MaxValue); | 144 | int.MaxValue); |
145 | 145 | ||
146 | m_log.DebugFormat( | 146 | // m_log.DebugFormat( |
147 | "[NPC MODULE]: Creating NPC {0} {1} {2}, owner={3}, senseAsAgent={4} at {5} in {6}", | 147 | // "[NPC MODULE]: Creating NPC {0} {1} {2}, owner={3}, senseAsAgent={4} at {5} in {6}", |
148 | firstname, lastname, npcAvatar.AgentId, owner, | 148 | // firstname, lastname, npcAvatar.AgentId, owner, senseAsAgent, position, scene.RegionInfo.RegionName); |
149 | senseAsAgent, position, scene.RegionInfo.RegionName); | ||
150 | 149 | ||
151 | AgentCircuitData acd = new AgentCircuitData(); | 150 | AgentCircuitData acd = new AgentCircuitData(); |
152 | acd.AgentID = npcAvatar.AgentId; | 151 | acd.AgentID = npcAvatar.AgentId; |
@@ -169,36 +168,30 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
169 | } | 168 | } |
170 | */ | 169 | */ |
171 | 170 | ||
172 | lock (m_avatars) | 171 | ManualResetEvent ev = new ManualResetEvent(false); |
173 | { | ||
174 | scene.AuthenticateHandler.AddNewCircuit(npcAvatar.CircuitCode, | ||
175 | acd); | ||
176 | scene.AddNewClient(npcAvatar, PresenceType.Npc); | ||
177 | 172 | ||
178 | ScenePresence sp; | 173 | Util.FireAndForget(delegate(object x) { |
179 | if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp)) | 174 | lock (m_avatars) |
180 | { | 175 | { |
181 | /* | 176 | scene.AuthenticateHandler.AddNewCircuit(npcAvatar.CircuitCode, acd); |
182 | m_log.DebugFormat( | 177 | scene.AddNewClient(npcAvatar, PresenceType.Npc); |
183 | "[NPC MODULE]: Successfully retrieved scene presence for NPC {0} {1}", | ||
184 | sp.Name, sp.UUID); | ||
185 | */ | ||
186 | |||
187 | sp.CompleteMovement(npcAvatar, false); | ||
188 | m_avatars.Add(npcAvatar.AgentId, npcAvatar); | ||
189 | m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", | ||
190 | npcAvatar.AgentId, sp.Name); | ||
191 | 178 | ||
192 | return npcAvatar.AgentId; | 179 | ScenePresence sp; |
193 | } | 180 | if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp)) |
194 | else | 181 | { |
195 | { | 182 | sp.CompleteMovement(npcAvatar, false); |
196 | m_log.WarnFormat( | 183 | m_avatars.Add(npcAvatar.AgentId, npcAvatar); |
197 | "[NPC MODULE]: Could not find scene presence for NPC {0} {1}", | 184 | // m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name); |
198 | sp.Name, sp.UUID); | 185 | } |
199 | return UUID.Zero; | ||
200 | } | 186 | } |
201 | } | 187 | ev.Set(); |
188 | }); | ||
189 | |||
190 | ev.WaitOne(); | ||
191 | |||
192 | // m_log.DebugFormat("[NPC MODULE]: Created NPC with id {0}", npcAvatar.AgentId); | ||
193 | |||
194 | return npcAvatar.AgentId; | ||
202 | } | 195 | } |
203 | 196 | ||
204 | public bool MoveToTarget(UUID agentID, Scene scene, Vector3 pos, | 197 | public bool MoveToTarget(UUID agentID, Scene scene, Vector3 pos, |
@@ -211,10 +204,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
211 | ScenePresence sp; | 204 | ScenePresence sp; |
212 | if (scene.TryGetScenePresence(agentID, out sp)) | 205 | if (scene.TryGetScenePresence(agentID, out sp)) |
213 | { | 206 | { |
214 | m_log.DebugFormat( | 207 | // m_log.DebugFormat( |
215 | "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}", | 208 | // "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}", |
216 | sp.Name, pos, scene.RegionInfo.RegionName, | 209 | // sp.Name, pos, scene.RegionInfo.RegionName, noFly, landAtTarget); |
217 | noFly, landAtTarget); | ||
218 | 210 | ||
219 | sp.MoveToTarget(pos, noFly, landAtTarget); | 211 | sp.MoveToTarget(pos, noFly, landAtTarget); |
220 | sp.SetAlwaysRun = running; | 212 | sp.SetAlwaysRun = running; |
@@ -385,10 +377,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
385 | */ | 377 | */ |
386 | scene.RemoveClient(agentID, false); | 378 | scene.RemoveClient(agentID, false); |
387 | m_avatars.Remove(agentID); | 379 | m_avatars.Remove(agentID); |
388 | /* | 380 | |
389 | m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", | 381 | // m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", agentID, av.Name); |
390 | agentID, av.Name); | ||
391 | */ | ||
392 | return true; | 382 | return true; |
393 | } | 383 | } |
394 | } | 384 | } |
@@ -405,9 +395,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
405 | { | 395 | { |
406 | NPCAvatar av; | 396 | NPCAvatar av; |
407 | if (m_avatars.TryGetValue(npcID, out av)) | 397 | if (m_avatars.TryGetValue(npcID, out av)) |
398 | { | ||
399 | if (npcID == callerID) | ||
400 | return true; | ||
408 | return CheckPermissions(av, callerID); | 401 | return CheckPermissions(av, callerID); |
402 | } | ||
409 | else | 403 | else |
404 | { | ||
410 | return false; | 405 | return false; |
406 | } | ||
411 | } | 407 | } |
412 | } | 408 | } |
413 | 409 | ||
@@ -419,8 +415,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
419 | /// <returns>true if they do, false if they don't.</returns> | 415 | /// <returns>true if they do, false if they don't.</returns> |
420 | private bool CheckPermissions(NPCAvatar av, UUID callerID) | 416 | private bool CheckPermissions(NPCAvatar av, UUID callerID) |
421 | { | 417 | { |
422 | return callerID == UUID.Zero || av.OwnerID == UUID.Zero || | 418 | return callerID == UUID.Zero || av.OwnerID == UUID.Zero || av.OwnerID == callerID || av.AgentId == callerID; |
423 | av.OwnerID == callerID; | ||
424 | } | 419 | } |
425 | } | 420 | } |
426 | } | 421 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index bf23040..34362af 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests | |||
110 | // ScenePresence.SendInitialData() to reset our entire appearance. | 110 | // ScenePresence.SendInitialData() to reset our entire appearance. |
111 | m_scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId)); | 111 | m_scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId)); |
112 | 112 | ||
113 | m_afMod.SetAppearance(sp, originalTe, null); | 113 | m_afMod.SetAppearance(sp, originalTe, null, new WearableCacheItem[0] ); |
114 | 114 | ||
115 | UUID npcId = m_npcMod.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, sp.Appearance); | 115 | UUID npcId = m_npcMod.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, sp.Appearance); |
116 | 116 | ||