Merge branch 'master' into careminster

1 files changed, 31 insertions, 0 deletions

diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 4700bf2..0ca8ffe 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
     }