Merge branch 'master' into presence-refactor

3 files changed, 93 insertions, 0 deletions

diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 0141718..b3582e9 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -756,6 +756,25 @@ namespace OpenSim.Client.MXP.ClientStack
         public event AvatarNotesUpdate OnAvatarNotesUpdate;
         public event MuteListRequest OnMuteListRequest;
         public event AvatarInterestUpdate OnAvatarInterestUpdate;
+        public event FindAgentUpdate OnFindAgentEvent;
+                public event TrackAgentUpdate OnTrackAgentEvent;
+                public event NewUserReport OnUserReportEvent;
+                public event SaveStateHandler OnSaveStateEvent;
+                public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
+                public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
+                public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;         
+                public event FreezeUserUpdate OnParcelFreezeUserEvent;
+                public event EjectUserUpdate OnParcelEjectUserEvent;
+                public event ParcelBuyPass OnParcelBuyPass;
+                public event ParcelGodMark OnParcelGodMark;
+                public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
+                public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
+                public event SimWideDeletesDelegate OnSimWideDeletes;
+                public event SendPostcard OnSendPostcard;
+                public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
+                public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
+                public event GodlikeMessage onGodlikeMessageEvent;
+                public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
 
         public event PlacesQuery OnPlacesQuery;
 
@@ -1659,5 +1678,17 @@ namespace OpenSim.Client.MXP.ClientStack
         public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
         {
         }
+        
+        public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
+        {
+        }
+        
+        public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
+        {
+        }
+        
+        public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
+        {
+        }
     }
 }
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index e8d1889..75b2347 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -374,6 +374,25 @@ namespace OpenSim.Client.Sirikata.ClientStack
         public event GrantUserFriendRights OnGrantUserRights;
         public event MuteListRequest OnMuteListRequest;
         public event PlacesQuery OnPlacesQuery;
+        public event FindAgentUpdate OnFindAgentEvent;
+                public event TrackAgentUpdate OnTrackAgentEvent;
+                public event NewUserReport OnUserReportEvent;
+                public event SaveStateHandler OnSaveStateEvent;
+                public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
+                public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
+                public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;         
+                public event FreezeUserUpdate OnParcelFreezeUserEvent;
+                public event EjectUserUpdate OnParcelEjectUserEvent;
+                public event ParcelBuyPass OnParcelBuyPass;
+                public event ParcelGodMark OnParcelGodMark;
+                public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
+                public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
+                public event SimWideDeletesDelegate OnSimWideDeletes;
+                public event SendPostcard OnSendPostcard;
+                public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
+                public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
+                public event GodlikeMessage onGodlikeMessageEvent;
+                public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
         public void SetDebugPacketLevel(int newDebug)
         {
             throw new System.NotImplementedException();
@@ -1121,6 +1140,18 @@ namespace OpenSim.Client.Sirikata.ClientStack
         {
             throw new System.NotImplementedException();
         }
+        
+        public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
+        {
+        }
+        
+        public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
+        {
+        }
+        
+        public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
+        {
+        }
 
         #endregion
     }
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 74cecea..029e23f 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -405,6 +405,25 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
         public event MuteListRequest OnMuteListRequest = delegate { };
         public event AvatarInterestUpdate OnAvatarInterestUpdate = delegate { };
         public event PlacesQuery OnPlacesQuery = delegate { };
+        public event FindAgentUpdate OnFindAgentEvent = delegate { };
+                public event TrackAgentUpdate OnTrackAgentEvent = delegate { };
+                public event NewUserReport OnUserReportEvent = delegate { };
+                public event SaveStateHandler OnSaveStateEvent = delegate { };
+                public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest = delegate { };
+                public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest = delegate { };
+                public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest = delegate { };  
+                public event FreezeUserUpdate OnParcelFreezeUserEvent = delegate { };
+                public event EjectUserUpdate OnParcelEjectUserEvent = delegate { };
+                public event ParcelBuyPass OnParcelBuyPass = delegate { };
+                public event ParcelGodMark OnParcelGodMark = delegate { };
+                public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest = delegate { };
+                public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest = delegate { };
+                public event SimWideDeletesDelegate OnSimWideDeletes = delegate { };
+                public event SendPostcard OnSendPostcard = delegate { };
+                public event MuteListEntryUpdate OnUpdateMuteListEntryEvent = delegate { };
+                public event MuteListEntryRemove OnRemoveMuteListEntryEvent = delegate { };
+                public event GodlikeMessage onGodlikeMessageEvent = delegate { };
+                public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent = delegate { };
 
 
 
@@ -1165,5 +1184,17 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
         public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
         {
         }
+
+        public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
+        {
+        }
+        
+        public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
+        {
+        }
+        
+        public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
+        {
+        }
     }
 }