diff options
author | Diva Canto | 2010-01-15 17:24:41 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-15 17:24:41 -0800 |
commit | 32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f (patch) | |
tree | e20c1afa3edc76101eea15765a447b13b3c4946e /OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |
parent | Comment (diff) | |
parent | Merge branch 'master' into presence-refactor (diff) | |
download | opensim-SC_OLD-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.zip opensim-SC_OLD-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.tar.gz opensim-SC_OLD-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.tar.bz2 opensim-SC_OLD-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.tar.xz |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Client/MXP/ClientStack/MXPClientView.cs')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index a31e0c0..2d80d83 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -756,25 +756,25 @@ namespace OpenSim.Client.MXP.ClientStack | |||
756 | public event AvatarNotesUpdate OnAvatarNotesUpdate; | 756 | public event AvatarNotesUpdate OnAvatarNotesUpdate; |
757 | public event MuteListRequest OnMuteListRequest; | 757 | public event MuteListRequest OnMuteListRequest; |
758 | public event AvatarInterestUpdate OnAvatarInterestUpdate; | 758 | public event AvatarInterestUpdate OnAvatarInterestUpdate; |
759 | public event FindAgentUpdate OnFindAgentEvent; | 759 | public event FindAgentUpdate OnFindAgent; |
760 | public event TrackAgentUpdate OnTrackAgentEvent; | 760 | public event TrackAgentUpdate OnTrackAgent; |
761 | public event NewUserReport OnUserReportEvent; | 761 | public event NewUserReport OnUserReport; |
762 | public event SaveStateHandler OnSaveStateEvent; | 762 | public event SaveStateHandler OnSaveState; |
763 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; | 763 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; |
764 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; | 764 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; |
765 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; | 765 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; |
766 | public event FreezeUserUpdate OnParcelFreezeUserEvent; | 766 | public event FreezeUserUpdate OnParcelFreezeUser; |
767 | public event EjectUserUpdate OnParcelEjectUserEvent; | 767 | public event EjectUserUpdate OnParcelEjectUser; |
768 | public event ParcelBuyPass OnParcelBuyPass; | 768 | public event ParcelBuyPass OnParcelBuyPass; |
769 | public event ParcelGodMark OnParcelGodMark; | 769 | public event ParcelGodMark OnParcelGodMark; |
770 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; | 770 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; |
771 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 771 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
772 | public event SimWideDeletesDelegate OnSimWideDeletes; | 772 | public event SimWideDeletesDelegate OnSimWideDeletes; |
773 | public event SendPostcard OnSendPostcard; | 773 | public event SendPostcard OnSendPostcard; |
774 | public event MuteListEntryUpdate OnUpdateMuteListEntryEvent; | 774 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
775 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; | 775 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
776 | public event GodlikeMessage onGodlikeMessageEvent; | 776 | public event GodlikeMessage onGodlikeMessage; |
777 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; | 777 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
778 | 778 | ||
779 | public event PlacesQuery OnPlacesQuery; | 779 | public event PlacesQuery OnPlacesQuery; |
780 | 780 | ||
@@ -1217,7 +1217,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
1217 | // Need to translate to MXP somehow | 1217 | // Need to translate to MXP somehow |
1218 | } | 1218 | } |
1219 | 1219 | ||
1220 | public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) | 1220 | public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID) |
1221 | { | 1221 | { |
1222 | // Need to translate to MXP somehow | 1222 | // Need to translate to MXP somehow |
1223 | } | 1223 | } |
@@ -1688,7 +1688,15 @@ namespace OpenSim.Client.MXP.ClientStack | |||
1688 | } | 1688 | } |
1689 | 1689 | ||
1690 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) | 1690 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) |
1691 | { | 1691 | { |
1692 | } | ||
1693 | |||
1694 | public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) | ||
1695 | { | ||
1696 | } | ||
1697 | |||
1698 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) | ||
1699 | { | ||
1692 | } | 1700 | } |
1693 | } | 1701 | } |
1694 | } | 1702 | } |