diff options
author | Melanie | 2010-01-04 21:41:33 +0000 |
---|---|---|
committer | Melanie | 2010-01-04 21:41:33 +0000 |
commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Client/MXP | |
parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
parent | Finish conversion if XInventoryService (diff) | |
download | opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Client/MXP')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index b3582e9..dbb9611 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -757,24 +757,24 @@ namespace OpenSim.Client.MXP.ClientStack | |||
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 OnFindAgentEvent; |
760 | public event TrackAgentUpdate OnTrackAgentEvent; | 760 | public event TrackAgentUpdate OnTrackAgentEvent; |
761 | public event NewUserReport OnUserReportEvent; | 761 | public event NewUserReport OnUserReportEvent; |
762 | public event SaveStateHandler OnSaveStateEvent; | 762 | public event SaveStateHandler OnSaveStateEvent; |
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 OnParcelFreezeUserEvent; |
767 | public event EjectUserUpdate OnParcelEjectUserEvent; | 767 | public event EjectUserUpdate OnParcelEjectUserEvent; |
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 OnUpdateMuteListEntryEvent; |
775 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; | 775 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; |
776 | public event GodlikeMessage onGodlikeMessageEvent; | 776 | public event GodlikeMessage onGodlikeMessageEvent; |
777 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; | 777 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; |
778 | 778 | ||
779 | public event PlacesQuery OnPlacesQuery; | 779 | public event PlacesQuery OnPlacesQuery; |
780 | 780 | ||