diff options
Diffstat (limited to 'OpenSim/Region')
7 files changed, 208 insertions, 146 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 0eed284..f3fd249 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -298,25 +298,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
298 | public event AvatarInterestUpdate OnAvatarInterestUpdate; | 298 | public event AvatarInterestUpdate OnAvatarInterestUpdate; |
299 | public event PlacesQuery OnPlacesQuery; | 299 | public event PlacesQuery OnPlacesQuery; |
300 | public event AgentFOV OnAgentFOV; | 300 | public event AgentFOV OnAgentFOV; |
301 | public event FindAgentUpdate OnFindAgentEvent; | 301 | public event FindAgentUpdate OnFindAgent; |
302 | public event TrackAgentUpdate OnTrackAgentEvent; | 302 | public event TrackAgentUpdate OnTrackAgent; |
303 | public event NewUserReport OnUserReportEvent; | 303 | public event NewUserReport OnUserReport; |
304 | public event SaveStateHandler OnSaveStateEvent; | 304 | public event SaveStateHandler OnSaveState; |
305 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; | 305 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; |
306 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; | 306 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; |
307 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; | 307 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; |
308 | public event FreezeUserUpdate OnParcelFreezeUserEvent; | 308 | public event FreezeUserUpdate OnParcelFreezeUser; |
309 | public event EjectUserUpdate OnParcelEjectUserEvent; | 309 | public event EjectUserUpdate OnParcelEjectUser; |
310 | public event ParcelBuyPass OnParcelBuyPass; | 310 | public event ParcelBuyPass OnParcelBuyPass; |
311 | public event ParcelGodMark OnParcelGodMark; | 311 | public event ParcelGodMark OnParcelGodMark; |
312 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; | 312 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; |
313 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 313 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
314 | public event SimWideDeletesDelegate OnSimWideDeletes; | 314 | public event SimWideDeletesDelegate OnSimWideDeletes; |
315 | public event SendPostcard OnSendPostcard; | 315 | public event SendPostcard OnSendPostcard; |
316 | public event MuteListEntryUpdate OnUpdateMuteListEntryEvent; | 316 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
317 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; | 317 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
318 | public event GodlikeMessage onGodlikeMessageEvent; | 318 | public event GodlikeMessage onGodlikeMessage; |
319 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; | 319 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
320 | 320 | ||
321 | 321 | ||
322 | #endregion Events | 322 | #endregion Events |
@@ -825,37 +825,39 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
825 | } | 825 | } |
826 | OutPacket(gmp, ThrottleOutPacketType.Task); | 826 | OutPacket(gmp, ThrottleOutPacketType.Task); |
827 | } | 827 | } |
828 | 828 | ||
829 | public void SendGroupActiveProposals(IClientAPI sender,UUID agentID, UUID sessionID, UUID groupID, UUID transactionID, Dictionary<int, string> VoteID, Dictionary<int, string> VoteInitiator, Dictionary<int, string> Majority, Dictionary<int, string> Quorum, Dictionary<int, string> TerseDateID, Dictionary<int, string> StartDateTime, Dictionary<int, string> EndDateTime, Dictionary<int, string> ProposalText) | 829 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) |
830 | { | 830 | { |
831 | foreach (KeyValuePair<int, string> Blank in VoteID) | 831 | int i = 0; |
832 | foreach (GroupActiveProposals Proposal in Proposals) | ||
832 | { | 833 | { |
833 | GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket(); | 834 | GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket(); |
834 | 835 | ||
835 | GAPIRP.AgentData.AgentID = agentID; | 836 | GAPIRP.AgentData.AgentID = AgentId; |
836 | GAPIRP.AgentData.GroupID = groupID; | 837 | GAPIRP.AgentData.GroupID = groupID; |
837 | GAPIRP.TransactionData.TransactionID = transactionID; | 838 | GAPIRP.TransactionData.TransactionID = transactionID; |
838 | GAPIRP.TransactionData.TotalNumItems = 1; | 839 | GAPIRP.TransactionData.TotalNumItems = ((uint)i+1); |
839 | GroupActiveProposalItemReplyPacket.ProposalDataBlock ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock(); | 840 | GroupActiveProposalItemReplyPacket.ProposalDataBlock ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock(); |
840 | GAPIRP.ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock[1]; | 841 | GAPIRP.ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock[1]; |
841 | ProposalData.VoteCast = Utils.StringToBytes("false"); | 842 | ProposalData.VoteCast = Utils.StringToBytes("false"); |
842 | ProposalData.VoteID = new UUID(VoteID[Blank.Key]); | 843 | ProposalData.VoteID = new UUID(Proposal.VoteID); |
843 | ProposalData.VoteInitiator = new UUID(VoteInitiator[Blank.Key]); | 844 | ProposalData.VoteInitiator = new UUID(Proposal.VoteInitiator); |
844 | ProposalData.Majority = (float)Convert.ToInt32(Majority[Blank.Key]); | 845 | ProposalData.Majority = (float)Convert.ToInt32(Proposal.Majority); |
845 | ProposalData.Quorum = Convert.ToInt32(Quorum[Blank.Key]); | 846 | ProposalData.Quorum = Convert.ToInt32(Proposal.Quorum); |
846 | ProposalData.TerseDateID = Utils.StringToBytes(TerseDateID[Blank.Key]); | 847 | ProposalData.TerseDateID = Utils.StringToBytes(Proposal.TerseDateID); |
847 | ProposalData.StartDateTime = Utils.StringToBytes(StartDateTime[Blank.Key]); | 848 | ProposalData.StartDateTime = Utils.StringToBytes(Proposal.StartDateTime); |
848 | ProposalData.EndDateTime = Utils.StringToBytes(EndDateTime[Blank.Key]); | 849 | ProposalData.EndDateTime = Utils.StringToBytes(Proposal.EndDateTime); |
849 | ProposalData.ProposalText = Utils.StringToBytes(ProposalText[Blank.Key]); | 850 | ProposalData.ProposalText = Utils.StringToBytes(Proposal.ProposalText); |
850 | ProposalData.AlreadyVoted = false; | 851 | ProposalData.AlreadyVoted = false; |
851 | GAPIRP.ProposalData[0] = ProposalData; | 852 | GAPIRP.ProposalData[i] = ProposalData; |
852 | OutPacket(GAPIRP, ThrottleOutPacketType.Task); | 853 | OutPacket(GAPIRP, ThrottleOutPacketType.Task); |
854 | i++; | ||
853 | } | 855 | } |
854 | if (VoteID.Count == 0) | 856 | if (Proposals.Length == 0) |
855 | { | 857 | { |
856 | GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket(); | 858 | GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket(); |
857 | 859 | ||
858 | GAPIRP.AgentData.AgentID = agentID; | 860 | GAPIRP.AgentData.AgentID = AgentId; |
859 | GAPIRP.AgentData.GroupID = groupID; | 861 | GAPIRP.AgentData.GroupID = groupID; |
860 | GAPIRP.TransactionData.TransactionID = transactionID; | 862 | GAPIRP.TransactionData.TransactionID = transactionID; |
861 | GAPIRP.TransactionData.TotalNumItems = 1; | 863 | GAPIRP.TransactionData.TotalNumItems = 1; |
@@ -875,40 +877,42 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
875 | OutPacket(GAPIRP, ThrottleOutPacketType.Task); | 877 | OutPacket(GAPIRP, ThrottleOutPacketType.Task); |
876 | } | 878 | } |
877 | } | 879 | } |
878 | 880 | ||
879 | public void SendGroupVoteHistory(IClientAPI sender,UUID agentID, UUID sessionID, UUID groupID, UUID transactionID, Dictionary<int, string> VoteID, Dictionary<int, string> VoteInitiator, Dictionary<int, string> Majority, Dictionary<int, string> Quorum, Dictionary<int, string> TerseDateID, Dictionary<int, string> StartDateTime, Dictionary<int, string> EndDateTime, Dictionary<int, string> VoteType, Dictionary<int, string> VoteResult, Dictionary<int, string> ProposalText) | 881 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) |
880 | { | 882 | { |
881 | foreach (KeyValuePair<int, string> Blank in VoteID) | 883 | int i = 0; |
884 | foreach (GroupVoteHistory Vote in Votes) | ||
882 | { | 885 | { |
883 | GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket(); | 886 | GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket(); |
884 | 887 | ||
885 | GVHIRP.AgentData.AgentID = agentID; | 888 | GVHIRP.AgentData.AgentID = AgentId; |
886 | GVHIRP.AgentData.GroupID = groupID; | 889 | GVHIRP.AgentData.GroupID = groupID; |
887 | GVHIRP.TransactionData.TransactionID = transactionID; | 890 | GVHIRP.TransactionData.TransactionID = transactionID; |
888 | GVHIRP.TransactionData.TotalNumItems = 1; | 891 | GVHIRP.TransactionData.TotalNumItems = ((uint)i+1); |
889 | GVHIRP.HistoryItemData.VoteID = new UUID(VoteID[Blank.Key]); | 892 | GVHIRP.HistoryItemData.VoteID = new UUID(Vote.VoteID); |
890 | GVHIRP.HistoryItemData.VoteInitiator = new UUID(VoteInitiator[Blank.Key]); | 893 | GVHIRP.HistoryItemData.VoteInitiator = new UUID(Vote.VoteInitiator); |
891 | GVHIRP.HistoryItemData.Majority = (float)Convert.ToInt32(Majority[Blank.Key]); | 894 | GVHIRP.HistoryItemData.Majority = (float)Convert.ToInt32(Vote.Majority); |
892 | GVHIRP.HistoryItemData.Quorum = Convert.ToInt32(Quorum[Blank.Key]); | 895 | GVHIRP.HistoryItemData.Quorum = Convert.ToInt32(Vote.Quorum); |
893 | GVHIRP.HistoryItemData.TerseDateID = Utils.StringToBytes(TerseDateID[Blank.Key]); | 896 | GVHIRP.HistoryItemData.TerseDateID = Utils.StringToBytes(Vote.TerseDateID); |
894 | GVHIRP.HistoryItemData.StartDateTime = Utils.StringToBytes(StartDateTime[Blank.Key]); | 897 | GVHIRP.HistoryItemData.StartDateTime = Utils.StringToBytes(Vote.StartDateTime); |
895 | GVHIRP.HistoryItemData.EndDateTime = Utils.StringToBytes(EndDateTime[Blank.Key]); | 898 | GVHIRP.HistoryItemData.EndDateTime = Utils.StringToBytes(Vote.EndDateTime); |
896 | GVHIRP.HistoryItemData.VoteType = Utils.StringToBytes(VoteType[Blank.Key]); | 899 | GVHIRP.HistoryItemData.VoteType = Utils.StringToBytes(Vote.VoteType); |
897 | GVHIRP.HistoryItemData.VoteResult = Utils.StringToBytes(VoteResult[Blank.Key]); | 900 | GVHIRP.HistoryItemData.VoteResult = Utils.StringToBytes(Vote.VoteResult); |
898 | GVHIRP.HistoryItemData.ProposalText = Utils.StringToBytes(ProposalText[Blank.Key]); | 901 | GVHIRP.HistoryItemData.ProposalText = Utils.StringToBytes(Vote.ProposalText); |
899 | GroupVoteHistoryItemReplyPacket.VoteItemBlock VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock(); | 902 | GroupVoteHistoryItemReplyPacket.VoteItemBlock VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock(); |
900 | GVHIRP.VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock[1]; | 903 | GVHIRP.VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock[1]; |
901 | VoteItem.CandidateID = UUID.Zero; | 904 | VoteItem.CandidateID = UUID.Zero; |
902 | VoteItem.NumVotes = 0; //TODO: FIX THIS!!! | 905 | VoteItem.NumVotes = 0; //TODO: FIX THIS!!! |
903 | VoteItem.VoteCast = Utils.StringToBytes("Yes"); | 906 | VoteItem.VoteCast = Utils.StringToBytes("Yes"); |
904 | GVHIRP.VoteItem[0] = VoteItem; | 907 | GVHIRP.VoteItem[i] = VoteItem; |
905 | OutPacket(GVHIRP, ThrottleOutPacketType.Task); | 908 | OutPacket(GVHIRP, ThrottleOutPacketType.Task); |
906 | } | 909 | i++; |
907 | if (VoteID.Count == 0) | 910 | } |
911 | if (Votes.Length == 0) | ||
908 | { | 912 | { |
909 | GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket(); | 913 | GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket(); |
910 | 914 | ||
911 | GVHIRP.AgentData.AgentID = agentID; | 915 | GVHIRP.AgentData.AgentID = AgentId; |
912 | GVHIRP.AgentData.GroupID = groupID; | 916 | GVHIRP.AgentData.GroupID = groupID; |
913 | GVHIRP.TransactionData.TransactionID = transactionID; | 917 | GVHIRP.TransactionData.TransactionID = transactionID; |
914 | GVHIRP.TransactionData.TotalNumItems = 0; | 918 | GVHIRP.TransactionData.TotalNumItems = 0; |
@@ -4876,7 +4880,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4876 | { | 4880 | { |
4877 | FreezeUserPacket FreezeUser = (FreezeUserPacket)Packet; | 4881 | FreezeUserPacket FreezeUser = (FreezeUserPacket)Packet; |
4878 | 4882 | ||
4879 | FreezeUserUpdate FreezeUserHandler = OnParcelFreezeUserEvent; | 4883 | FreezeUserUpdate FreezeUserHandler = OnParcelFreezeUser; |
4880 | if (FreezeUserHandler != null) | 4884 | if (FreezeUserHandler != null) |
4881 | { | 4885 | { |
4882 | FreezeUserHandler(this, | 4886 | FreezeUserHandler(this, |
@@ -4893,7 +4897,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4893 | EjectUserPacket EjectUser = | 4897 | EjectUserPacket EjectUser = |
4894 | (EjectUserPacket)Packet; | 4898 | (EjectUserPacket)Packet; |
4895 | 4899 | ||
4896 | EjectUserUpdate EjectUserHandler = OnParcelEjectUserEvent; | 4900 | EjectUserUpdate EjectUserHandler = OnParcelEjectUser; |
4897 | if (EjectUserHandler != null) | 4901 | if (EjectUserHandler != null) |
4898 | { | 4902 | { |
4899 | EjectUserHandler(this, | 4903 | EjectUserHandler(this, |
@@ -5292,7 +5296,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5292 | FindAgentPacket FindAgent = | 5296 | FindAgentPacket FindAgent = |
5293 | (FindAgentPacket)Packet; | 5297 | (FindAgentPacket)Packet; |
5294 | 5298 | ||
5295 | FindAgentUpdate FindAgentHandler = OnFindAgentEvent; | 5299 | FindAgentUpdate FindAgentHandler = OnFindAgent; |
5296 | if (FindAgentHandler != null) | 5300 | if (FindAgentHandler != null) |
5297 | { | 5301 | { |
5298 | FindAgentHandler(this,FindAgent.AgentBlock.Hunter,FindAgent.AgentBlock.Prey); | 5302 | FindAgentHandler(this,FindAgent.AgentBlock.Hunter,FindAgent.AgentBlock.Prey); |
@@ -5306,7 +5310,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5306 | TrackAgentPacket TrackAgent = | 5310 | TrackAgentPacket TrackAgent = |
5307 | (TrackAgentPacket)Packet; | 5311 | (TrackAgentPacket)Packet; |
5308 | 5312 | ||
5309 | TrackAgentUpdate TrackAgentHandler = OnTrackAgentEvent; | 5313 | TrackAgentUpdate TrackAgentHandler = OnTrackAgent; |
5310 | if (TrackAgentHandler != null) | 5314 | if (TrackAgentHandler != null) |
5311 | { | 5315 | { |
5312 | TrackAgentHandler(this, | 5316 | TrackAgentHandler(this, |
@@ -8592,7 +8596,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8592 | GodUpdateRegionInfoPacket GodUpdateRegionInfo = | 8596 | GodUpdateRegionInfoPacket GodUpdateRegionInfo = |
8593 | (GodUpdateRegionInfoPacket)Packet; | 8597 | (GodUpdateRegionInfoPacket)Packet; |
8594 | 8598 | ||
8595 | GodUpdateRegionInfoUpdate handlerGodUpdateRegionInfo = OnGodUpdateRegionInfoUpdateEvent; | 8599 | GodUpdateRegionInfoUpdate handlerGodUpdateRegionInfo = OnGodUpdateRegionInfoUpdate; |
8596 | if (handlerGodUpdateRegionInfo != null) | 8600 | if (handlerGodUpdateRegionInfo != null) |
8597 | { | 8601 | { |
8598 | handlerGodUpdateRegionInfo(this, | 8602 | handlerGodUpdateRegionInfo(this, |
@@ -8625,7 +8629,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8625 | GodlikeMessagePacket GodlikeMessage = | 8629 | GodlikeMessagePacket GodlikeMessage = |
8626 | (GodlikeMessagePacket)Packet; | 8630 | (GodlikeMessagePacket)Packet; |
8627 | 8631 | ||
8628 | GodlikeMessage handlerGodlikeMessage = onGodlikeMessageEvent; | 8632 | GodlikeMessage handlerGodlikeMessage = onGodlikeMessage; |
8629 | if (handlerGodlikeMessage != null) | 8633 | if (handlerGodlikeMessage != null) |
8630 | { | 8634 | { |
8631 | handlerGodlikeMessage(this, | 8635 | handlerGodlikeMessage(this, |
@@ -8641,7 +8645,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8641 | { | 8645 | { |
8642 | StateSavePacket SaveStateMessage = | 8646 | StateSavePacket SaveStateMessage = |
8643 | (StateSavePacket)Packet; | 8647 | (StateSavePacket)Packet; |
8644 | SaveStateHandler handlerSaveStatePacket = OnSaveStateEvent; | 8648 | SaveStateHandler handlerSaveStatePacket = OnSaveState; |
8645 | if (handlerSaveStatePacket != null) | 8649 | if (handlerSaveStatePacket != null) |
8646 | { | 8650 | { |
8647 | handlerSaveStatePacket(this,SaveStateMessage.AgentData.AgentID); | 8651 | handlerSaveStatePacket(this,SaveStateMessage.AgentData.AgentID); |
@@ -9005,7 +9009,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9005 | { | 9009 | { |
9006 | UpdateMuteListEntryPacket UpdateMuteListEntry = | 9010 | UpdateMuteListEntryPacket UpdateMuteListEntry = |
9007 | (UpdateMuteListEntryPacket)Packet; | 9011 | (UpdateMuteListEntryPacket)Packet; |
9008 | MuteListEntryUpdate handlerUpdateMuteListEntry = OnUpdateMuteListEntryEvent; | 9012 | MuteListEntryUpdate handlerUpdateMuteListEntry = OnUpdateMuteListEntry; |
9009 | if (handlerUpdateMuteListEntry != null) | 9013 | if (handlerUpdateMuteListEntry != null) |
9010 | { | 9014 | { |
9011 | handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID, | 9015 | handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID, |
@@ -9021,7 +9025,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9021 | { | 9025 | { |
9022 | RemoveMuteListEntryPacket RemoveMuteListEntry = | 9026 | RemoveMuteListEntryPacket RemoveMuteListEntry = |
9023 | (RemoveMuteListEntryPacket)Packet; | 9027 | (RemoveMuteListEntryPacket)Packet; |
9024 | MuteListEntryRemove handlerRemoveMuteListEntry = OnRemoveMuteListEntryEvent; | 9028 | MuteListEntryRemove handlerRemoveMuteListEntry = OnRemoveMuteListEntry; |
9025 | if (handlerRemoveMuteListEntry != null) | 9029 | if (handlerRemoveMuteListEntry != null) |
9026 | { | 9030 | { |
9027 | handlerRemoveMuteListEntry(this, | 9031 | handlerRemoveMuteListEntry(this, |
@@ -9038,7 +9042,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9038 | UserReportPacket UserReport = | 9042 | UserReportPacket UserReport = |
9039 | (UserReportPacket)Packet; | 9043 | (UserReportPacket)Packet; |
9040 | 9044 | ||
9041 | NewUserReport handlerUserReport = OnUserReportEvent; | 9045 | NewUserReport handlerUserReport = OnUserReport; |
9042 | if (handlerUserReport != null) | 9046 | if (handlerUserReport != null) |
9043 | { | 9047 | { |
9044 | handlerUserReport(this, | 9048 | handlerUserReport(this, |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index a4a649c..086d4fe 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -397,8 +397,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
397 | client.OnLogout += OnLogout; | 397 | client.OnLogout += OnLogout; |
398 | 398 | ||
399 | client.OnGrantUserRights += GrantUserFriendRights; | 399 | client.OnGrantUserRights += GrantUserFriendRights; |
400 | client.OnTrackAgentEvent += FindAgent; | 400 | client.OnTrackAgent += FindAgent; |
401 | client.OnFindAgentEvent += FindAgent; | 401 | client.OnFindAgent += FindAgent; |
402 | 402 | ||
403 | } | 403 | } |
404 | 404 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs index 7f9e5af..257c221 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | |||
@@ -47,6 +47,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
47 | private bool enabled = true; | 47 | private bool enabled = true; |
48 | private List<Scene> m_SceneList = new List<Scene>(); | 48 | private List<Scene> m_SceneList = new List<Scene>(); |
49 | private string m_RestURL = String.Empty; | 49 | private string m_RestURL = String.Empty; |
50 | private bool m_ForwardOfflineGroupMessages = true; | ||
50 | 51 | ||
51 | public void Initialise(Scene scene, IConfigSource config) | 52 | public void Initialise(Scene scene, IConfigSource config) |
52 | { | 53 | { |
@@ -67,6 +68,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
67 | return; | 68 | return; |
68 | } | 69 | } |
69 | 70 | ||
71 | if (cnf != null) | ||
72 | m_ForwardOfflineGroupMessages = cnf.GetBoolean("ForwardOfflineGroupMessages", m_ForwardOfflineGroupMessages); | ||
73 | |||
70 | lock (m_SceneList) | 74 | lock (m_SceneList) |
71 | { | 75 | { |
72 | if (m_SceneList.Count == 0) | 76 | if (m_SceneList.Count == 0) |
@@ -185,7 +189,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
185 | 189 | ||
186 | private void UndeliveredMessage(GridInstantMessage im) | 190 | private void UndeliveredMessage(GridInstantMessage im) |
187 | { | 191 | { |
188 | if (im.offline != 0) | 192 | if ((im.offline != 0) |
193 | && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) | ||
189 | { | 194 | { |
190 | bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( | 195 | bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( |
191 | "POST", m_RestURL+"/SaveMessage/", im); | 196 | "POST", m_RestURL+"/SaveMessage/", im); |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 4cdc33d..3659711 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -274,25 +274,25 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
274 | 274 | ||
275 | public event PlacesQuery OnPlacesQuery; | 275 | public event PlacesQuery OnPlacesQuery; |
276 | 276 | ||
277 | public event FindAgentUpdate OnFindAgentEvent; | 277 | public event FindAgentUpdate OnFindAgent; |
278 | public event TrackAgentUpdate OnTrackAgentEvent; | 278 | public event TrackAgentUpdate OnTrackAgent; |
279 | public event NewUserReport OnUserReportEvent; | 279 | public event NewUserReport OnUserReport; |
280 | public event SaveStateHandler OnSaveStateEvent; | 280 | public event SaveStateHandler OnSaveState; |
281 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; | 281 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; |
282 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; | 282 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; |
283 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; | 283 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; |
284 | public event FreezeUserUpdate OnParcelFreezeUserEvent; | 284 | public event FreezeUserUpdate OnParcelFreezeUser; |
285 | public event EjectUserUpdate OnParcelEjectUserEvent; | 285 | public event EjectUserUpdate OnParcelEjectUser; |
286 | public event ParcelBuyPass OnParcelBuyPass; | 286 | public event ParcelBuyPass OnParcelBuyPass; |
287 | public event ParcelGodMark OnParcelGodMark; | 287 | public event ParcelGodMark OnParcelGodMark; |
288 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; | 288 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; |
289 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 289 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
290 | public event SimWideDeletesDelegate OnSimWideDeletes; | 290 | public event SimWideDeletesDelegate OnSimWideDeletes; |
291 | public event SendPostcard OnSendPostcard; | 291 | public event SendPostcard OnSendPostcard; |
292 | public event MuteListEntryUpdate OnUpdateMuteListEntryEvent; | 292 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
293 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; | 293 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
294 | public event GodlikeMessage onGodlikeMessageEvent; | 294 | public event GodlikeMessage onGodlikeMessage; |
295 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; | 295 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
296 | 296 | ||
297 | #pragma warning restore 67 | 297 | #pragma warning restore 67 |
298 | 298 | ||
@@ -1133,7 +1133,15 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
1133 | } | 1133 | } |
1134 | 1134 | ||
1135 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) | 1135 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) |
1136 | { | 1136 | { |
1137 | } | ||
1138 | |||
1139 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) | ||
1140 | { | ||
1141 | } | ||
1142 | |||
1143 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) | ||
1144 | { | ||
1137 | } | 1145 | } |
1138 | } | 1146 | } |
1139 | } | 1147 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index a14e3ad..e5fc027 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -139,7 +139,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
139 | public uint TimeStampTerse; | 139 | public uint TimeStampTerse; |
140 | 140 | ||
141 | [XmlIgnore] | 141 | [XmlIgnore] |
142 | public UUID FromItemID; | 142 | public UUID FromItemID; |
143 | |||
144 | [XmlIgnore] | ||
145 | public int STATUS_ROTATE_X; | ||
146 | |||
147 | [XmlIgnore] | ||
148 | public int STATUS_ROTATE_Y; | ||
149 | |||
150 | [XmlIgnore] | ||
151 | public int STATUS_ROTATE_Z; | ||
143 | 152 | ||
144 | [XmlIgnore] | 153 | [XmlIgnore] |
145 | private Dictionary<int, string> m_CollisionFilter = new Dictionary<int, string>(); | 154 | private Dictionary<int, string> m_CollisionFilter = new Dictionary<int, string>(); |
@@ -1675,6 +1684,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
1675 | return false; | 1684 | return false; |
1676 | 1685 | ||
1677 | return m_parentGroup.RootPart.DIE_AT_EDGE; | 1686 | return m_parentGroup.RootPart.DIE_AT_EDGE; |
1687 | } | ||
1688 | |||
1689 | public int GetAxisRotation(int axis) | ||
1690 | { | ||
1691 | //Cannot use ScriptBaseClass constants as no referance to it currently. | ||
1692 | if (axis == 2)//STATUS_ROTATE_X | ||
1693 | return STATUS_ROTATE_X; | ||
1694 | if (axis == 4)//STATUS_ROTATE_Y | ||
1695 | return STATUS_ROTATE_Y; | ||
1696 | if (axis == 8)//STATUS_ROTATE_Z | ||
1697 | return STATUS_ROTATE_Z; | ||
1698 | |||
1699 | return 0; | ||
1678 | } | 1700 | } |
1679 | 1701 | ||
1680 | public double GetDistanceTo(Vector3 a, Vector3 b) | 1702 | public double GetDistanceTo(Vector3 a, Vector3 b) |
@@ -1923,24 +1945,24 @@ namespace OpenSim.Region.Framework.Scenes | |||
1923 | else | 1945 | else |
1924 | { | 1946 | { |
1925 | } | 1947 | } |
1926 | } | 1948 | } |
1927 | else | 1949 | else |
1928 | { | 1950 | { |
1929 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); | 1951 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); |
1930 | //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work | 1952 | //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work |
1931 | if (found) | 1953 | if (found) |
1932 | { | 1954 | { |
1933 | DetectedObject detobj = new DetectedObject(); | 1955 | DetectedObject detobj = new DetectedObject(); |
1934 | detobj.keyUUID = obj.UUID; | 1956 | detobj.keyUUID = obj.UUID; |
1935 | detobj.nameStr = obj.Name; | 1957 | detobj.nameStr = obj.Name; |
1936 | detobj.ownerUUID = obj._ownerID; | 1958 | detobj.ownerUUID = obj._ownerID; |
1937 | detobj.posVector = obj.AbsolutePosition; | 1959 | detobj.posVector = obj.AbsolutePosition; |
1938 | detobj.rotQuat = obj.GetWorldRotation(); | 1960 | detobj.rotQuat = obj.GetWorldRotation(); |
1939 | detobj.velVector = obj.Velocity; | 1961 | detobj.velVector = obj.Velocity; |
1940 | detobj.colliderType = 0; | 1962 | detobj.colliderType = 0; |
1941 | detobj.groupUUID = obj._groupID; | 1963 | detobj.groupUUID = obj._groupID; |
1942 | colliding.Add(detobj); | 1964 | colliding.Add(detobj); |
1943 | } | 1965 | } |
1944 | } | 1966 | } |
1945 | } | 1967 | } |
1946 | else | 1968 | else |
@@ -1952,8 +1974,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1952 | ScenePresence av = avlist[i]; | 1974 | ScenePresence av = avlist[i]; |
1953 | 1975 | ||
1954 | if (av.LocalId == localId) | 1976 | if (av.LocalId == localId) |
1955 | { | 1977 | { |
1956 | if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) | 1978 | if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.Name)) |
1957 | { | 1979 | { |
1958 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); | 1980 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); |
1959 | //If it is 1, it is to accept ONLY collisions from this avatar | 1981 | //If it is 1, it is to accept ONLY collisions from this avatar |
@@ -1974,24 +1996,24 @@ namespace OpenSim.Region.Framework.Scenes | |||
1974 | else | 1996 | else |
1975 | { | 1997 | { |
1976 | } | 1998 | } |
1977 | } | 1999 | } |
1978 | else | 2000 | else |
1979 | { | 2001 | { |
1980 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); | 2002 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); |
1981 | //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work | 2003 | //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work |
1982 | if (found) | 2004 | if (!found) |
1983 | { | 2005 | { |
1984 | DetectedObject detobj = new DetectedObject(); | 2006 | DetectedObject detobj = new DetectedObject(); |
1985 | detobj.keyUUID = av.UUID; | 2007 | detobj.keyUUID = av.UUID; |
1986 | detobj.nameStr = av.ControllingClient.Name; | 2008 | detobj.nameStr = av.ControllingClient.Name; |
1987 | detobj.ownerUUID = av.UUID; | 2009 | detobj.ownerUUID = av.UUID; |
1988 | detobj.posVector = av.AbsolutePosition; | 2010 | detobj.posVector = av.AbsolutePosition; |
1989 | detobj.rotQuat = av.Rotation; | 2011 | detobj.rotQuat = av.Rotation; |
1990 | detobj.velVector = av.Velocity; | 2012 | detobj.velVector = av.Velocity; |
1991 | detobj.colliderType = 0; | 2013 | detobj.colliderType = 0; |
1992 | detobj.groupUUID = av.ControllingClient.ActiveGroupId; | 2014 | detobj.groupUUID = av.ControllingClient.ActiveGroupId; |
1993 | colliding.Add(detobj); | 2015 | colliding.Add(detobj); |
1994 | } | 2016 | } |
1995 | } | 2017 | } |
1996 | 2018 | ||
1997 | } | 2019 | } |
@@ -2088,8 +2110,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2088 | ScenePresence av = avlist[i]; | 2110 | ScenePresence av = avlist[i]; |
2089 | 2111 | ||
2090 | if (av.LocalId == localId) | 2112 | if (av.LocalId == localId) |
2091 | { | 2113 | { |
2092 | if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) | 2114 | if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.Name)) |
2093 | { | 2115 | { |
2094 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); | 2116 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); |
2095 | //If it is 1, it is to accept ONLY collisions from this avatar | 2117 | //If it is 1, it is to accept ONLY collisions from this avatar |
@@ -2115,7 +2137,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2115 | { | 2137 | { |
2116 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); | 2138 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); |
2117 | //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work | 2139 | //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work |
2118 | if (found) | 2140 | if (!found) |
2119 | { | 2141 | { |
2120 | DetectedObject detobj = new DetectedObject(); | 2142 | DetectedObject detobj = new DetectedObject(); |
2121 | detobj.keyUUID = av.UUID; | 2143 | detobj.keyUUID = av.UUID; |
@@ -2219,8 +2241,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2219 | ScenePresence av = avlist[i]; | 2241 | ScenePresence av = avlist[i]; |
2220 | 2242 | ||
2221 | if (av.LocalId == localId) | 2243 | if (av.LocalId == localId) |
2222 | { | 2244 | { |
2223 | if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) | 2245 | if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.Name)) |
2224 | { | 2246 | { |
2225 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); | 2247 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); |
2226 | //If it is 1, it is to accept ONLY collisions from this avatar | 2248 | //If it is 1, it is to accept ONLY collisions from this avatar |
@@ -2246,7 +2268,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2246 | { | 2268 | { |
2247 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); | 2269 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); |
2248 | //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work | 2270 | //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work |
2249 | if (found) | 2271 | if (!found) |
2250 | { | 2272 | { |
2251 | DetectedObject detobj = new DetectedObject(); | 2273 | DetectedObject detobj = new DetectedObject(); |
2252 | detobj.keyUUID = av.UUID; | 2274 | detobj.keyUUID = av.UUID; |
@@ -2279,7 +2301,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2279 | m_parentGroup.Scene.EventManager.TriggerScriptCollidingEnd(LocalId, EndCollidingMessage); | 2301 | m_parentGroup.Scene.EventManager.TriggerScriptCollidingEnd(LocalId, EndCollidingMessage); |
2280 | } | 2302 | } |
2281 | } | 2303 | } |
2282 | } | 2304 | } |
2283 | } | 2305 | } |
2284 | 2306 | ||
2285 | public void PhysicsOutOfBounds(Vector3 pos) | 2307 | public void PhysicsOutOfBounds(Vector3 pos) |
@@ -2747,7 +2769,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
2747 | if (m_parentGroup != null) | 2769 | if (m_parentGroup != null) |
2748 | { | 2770 | { |
2749 | m_parentGroup.SetAxisRotation(axis, rotate); | 2771 | m_parentGroup.SetAxisRotation(axis, rotate); |
2750 | } | 2772 | } |
2773 | //Cannot use ScriptBaseClass constants as no referance to it currently. | ||
2774 | if (axis == 2)//STATUS_ROTATE_X | ||
2775 | STATUS_ROTATE_X = rotate; | ||
2776 | if (axis == 4)//STATUS_ROTATE_Y | ||
2777 | STATUS_ROTATE_Y = rotate; | ||
2778 | if (axis == 8)//STATUS_ROTATE_Z | ||
2779 | STATUS_ROTATE_Z = rotate; | ||
2751 | } | 2780 | } |
2752 | 2781 | ||
2753 | public void SetBuoyancy(float fvalue) | 2782 | public void SetBuoyancy(float fvalue) |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 7907570..671cfef 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -836,25 +836,25 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
836 | public event MuteListRequest OnMuteListRequest; | 836 | public event MuteListRequest OnMuteListRequest; |
837 | public event AvatarInterestUpdate OnAvatarInterestUpdate; | 837 | public event AvatarInterestUpdate OnAvatarInterestUpdate; |
838 | public event PlacesQuery OnPlacesQuery; | 838 | public event PlacesQuery OnPlacesQuery; |
839 | public event FindAgentUpdate OnFindAgentEvent; | 839 | public event FindAgentUpdate OnFindAgent; |
840 | public event TrackAgentUpdate OnTrackAgentEvent; | 840 | public event TrackAgentUpdate OnTrackAgent; |
841 | public event NewUserReport OnUserReportEvent; | 841 | public event NewUserReport OnUserReport; |
842 | public event SaveStateHandler OnSaveStateEvent; | 842 | public event SaveStateHandler OnSaveState; |
843 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; | 843 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; |
844 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; | 844 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; |
845 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; | 845 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; |
846 | public event FreezeUserUpdate OnParcelFreezeUserEvent; | 846 | public event FreezeUserUpdate OnParcelFreezeUser; |
847 | public event EjectUserUpdate OnParcelEjectUserEvent; | 847 | public event EjectUserUpdate OnParcelEjectUser; |
848 | public event ParcelBuyPass OnParcelBuyPass; | 848 | public event ParcelBuyPass OnParcelBuyPass; |
849 | public event ParcelGodMark OnParcelGodMark; | 849 | public event ParcelGodMark OnParcelGodMark; |
850 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; | 850 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; |
851 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 851 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
852 | public event SimWideDeletesDelegate OnSimWideDeletes; | 852 | public event SimWideDeletesDelegate OnSimWideDeletes; |
853 | public event SendPostcard OnSendPostcard; | 853 | public event SendPostcard OnSendPostcard; |
854 | public event MuteListEntryUpdate OnUpdateMuteListEntryEvent; | 854 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
855 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; | 855 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
856 | public event GodlikeMessage onGodlikeMessageEvent; | 856 | public event GodlikeMessage onGodlikeMessage; |
857 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; | 857 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
858 | 858 | ||
859 | #pragma warning restore 67 | 859 | #pragma warning restore 67 |
860 | 860 | ||
@@ -1657,7 +1657,15 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1657 | } | 1657 | } |
1658 | 1658 | ||
1659 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) | 1659 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) |
1660 | { | 1660 | { |
1661 | } | ||
1662 | |||
1663 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) | ||
1664 | { | ||
1665 | } | ||
1666 | |||
1667 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) | ||
1668 | { | ||
1661 | } | 1669 | } |
1662 | } | 1670 | } |
1663 | } | 1671 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index c862821..1639b7e 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -380,25 +380,25 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
380 | 380 | ||
381 | public event PlacesQuery OnPlacesQuery; | 381 | public event PlacesQuery OnPlacesQuery; |
382 | 382 | ||
383 | public event FindAgentUpdate OnFindAgentEvent; | 383 | public event FindAgentUpdate OnFindAgent; |
384 | public event TrackAgentUpdate OnTrackAgentEvent; | 384 | public event TrackAgentUpdate OnTrackAgent; |
385 | public event NewUserReport OnUserReportEvent; | 385 | public event NewUserReport OnUserReport; |
386 | public event SaveStateHandler OnSaveStateEvent; | 386 | public event SaveStateHandler OnSaveState; |
387 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; | 387 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; |
388 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; | 388 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; |
389 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; | 389 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; |
390 | public event FreezeUserUpdate OnParcelFreezeUserEvent; | 390 | public event FreezeUserUpdate OnParcelFreezeUser; |
391 | public event EjectUserUpdate OnParcelEjectUserEvent; | 391 | public event EjectUserUpdate OnParcelEjectUser; |
392 | public event ParcelBuyPass OnParcelBuyPass; | 392 | public event ParcelBuyPass OnParcelBuyPass; |
393 | public event ParcelGodMark OnParcelGodMark; | 393 | public event ParcelGodMark OnParcelGodMark; |
394 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; | 394 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; |
395 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 395 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
396 | public event SimWideDeletesDelegate OnSimWideDeletes; | 396 | public event SimWideDeletesDelegate OnSimWideDeletes; |
397 | public event SendPostcard OnSendPostcard; | 397 | public event SendPostcard OnSendPostcard; |
398 | public event MuteListEntryUpdate OnUpdateMuteListEntryEvent; | 398 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
399 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; | 399 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
400 | public event GodlikeMessage onGodlikeMessageEvent; | 400 | public event GodlikeMessage onGodlikeMessage; |
401 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; | 401 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
402 | 402 | ||
403 | #pragma warning restore 67 | 403 | #pragma warning restore 67 |
404 | 404 | ||
@@ -1138,7 +1138,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
1138 | } | 1138 | } |
1139 | 1139 | ||
1140 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) | 1140 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) |
1141 | { | 1141 | { |
1142 | } | ||
1143 | |||
1144 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) | ||
1145 | { | ||
1146 | } | ||
1147 | |||
1148 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) | ||
1149 | { | ||
1142 | } | 1150 | } |
1143 | } | 1151 | } |
1144 | } | 1152 | } |