Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor

1 files changed, 20 insertions, 12 deletions

diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 6f6d231..6a119bd 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -405,25 +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 FindAgentUpdate OnFindAgent = delegate { };
+        public event TrackAgentUpdate OnTrackAgent = delegate { };
+        public event NewUserReport OnUserReport = delegate { };
+        public event SaveStateHandler OnSaveState = 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 FreezeUserUpdate OnParcelFreezeUser = delegate { };
+        public event EjectUserUpdate OnParcelEjectUser = 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 { };
+        public event MuteListEntryUpdate OnUpdateMuteListEntry = delegate { };
+        public event MuteListEntryRemove OnRemoveMuteListEntry = delegate { };
+        public event GodlikeMessage onGodlikeMessage = delegate { };
+        public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate = delegate { };
 
 
 
@@ -767,7 +767,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
             throw new System.NotImplementedException();
         }
 
-        public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID)
+        public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
         {
             throw new System.NotImplementedException();
         }
@@ -1194,7 +1194,15 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
         }
         
         public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
-        {
+        {

+        }

+

+        public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)

+        {

+        }

+

+        public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)

+        {

         }
     }
 }