1 files changed, 65 insertions, 61 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 9944852..5eaaf12 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -298,25 +298,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event AvatarInterestUpdate OnAvatarInterestUpdate;
         public event PlacesQuery OnPlacesQuery;
         public event AgentFOV OnAgentFOV;
-        public event FindAgentUpdate OnFindAgentEvent;
-        public event TrackAgentUpdate OnTrackAgentEvent;
-        public event NewUserReport OnUserReportEvent;
-        public event SaveStateHandler OnSaveStateEvent;
+        public event FindAgentUpdate OnFindAgent;
+        public event TrackAgentUpdate OnTrackAgent;
+        public event NewUserReport OnUserReport;
+        public event SaveStateHandler OnSaveState;
         public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
         public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
         public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
-        public event FreezeUserUpdate OnParcelFreezeUserEvent;
-        public event EjectUserUpdate OnParcelEjectUserEvent;
+        public event FreezeUserUpdate OnParcelFreezeUser;
+        public event EjectUserUpdate OnParcelEjectUser;
         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 MuteListEntryUpdate OnUpdateMuteListEntry;
+        public event MuteListEntryRemove OnRemoveMuteListEntry;
+        public event GodlikeMessage onGodlikeMessage;
+        public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
         
 
         #endregion Events
@@ -826,32 +826,34 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(gmp, ThrottleOutPacketType.Task);
         }
         
-        public void SendGroupActiveProposals(IClientAPI sender,UUID agentID, UUID sessionID, UUID groupID, UUID transactionID, Dictionary<int, string> VoteID, Dictionary<int, string> VoteInitiator, Dictionary<int, string> Majority, Dictionary<int, string> Quorum, Dictionary<int, string> TerseDateID, Dictionary<int, string> StartDateTime, Dictionary<int, string> EndDateTime, Dictionary<int, string> ProposalText)
-        {
-            foreach (KeyValuePair<int, string> Blank in VoteID)
+        public void SendGroupActiveProposals(IClientAPI sender,UUID agentID, UUID sessionID, UUID groupID, UUID transactionID, string[] VoteID, string[] VoteInitiator, string[] Majority, string[] Quorum, string[] TerseDateID, string[] StartDateTime, string[] EndDateTime, string[] ProposalText)
+        {

+            int i = 0;
+            foreach (string voteID in VoteID)
             {
                 GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket();
                 
                 GAPIRP.AgentData.AgentID = agentID;
                 GAPIRP.AgentData.GroupID = groupID;
                 GAPIRP.TransactionData.TransactionID = transactionID;
-                GAPIRP.TransactionData.TotalNumItems = 1;
+                GAPIRP.TransactionData.TotalNumItems = ((uint)i+1);
                 GroupActiveProposalItemReplyPacket.ProposalDataBlock ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock();
                 GAPIRP.ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock[1];
                 ProposalData.VoteCast = Utils.StringToBytes("false");
-                ProposalData.VoteID = new UUID(VoteID[Blank.Key]);
-                ProposalData.VoteInitiator = new UUID(VoteInitiator[Blank.Key]);
-                ProposalData.Majority = (float)Convert.ToInt32(Majority[Blank.Key]);
-                ProposalData.Quorum = Convert.ToInt32(Quorum[Blank.Key]);
-                ProposalData.TerseDateID = Utils.StringToBytes(TerseDateID[Blank.Key]);
-                ProposalData.StartDateTime = Utils.StringToBytes(StartDateTime[Blank.Key]);
-                ProposalData.EndDateTime = Utils.StringToBytes(EndDateTime[Blank.Key]);
-                ProposalData.ProposalText = Utils.StringToBytes(ProposalText[Blank.Key]);
+                ProposalData.VoteID = new UUID(VoteID[i]);
+                ProposalData.VoteInitiator = new UUID(VoteInitiator[i]);
+                ProposalData.Majority = (float)Convert.ToInt32(Majority[i]);
+                ProposalData.Quorum = Convert.ToInt32(Quorum[i]);
+                ProposalData.TerseDateID = Utils.StringToBytes(TerseDateID[i]);
+                ProposalData.StartDateTime = Utils.StringToBytes(StartDateTime[i]);
+                ProposalData.EndDateTime = Utils.StringToBytes(EndDateTime[i]);
+                ProposalData.ProposalText = Utils.StringToBytes(ProposalText[i]);
                 ProposalData.AlreadyVoted = false;
-                GAPIRP.ProposalData[0] = ProposalData;
+                GAPIRP.ProposalData[i] = ProposalData;
                 OutPacket(GAPIRP, ThrottleOutPacketType.Task);
+                i++;
             }
-            if (VoteID.Count == 0)
+            if (VoteID.Length == 0)
             {
                 GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket();
                 
@@ -876,35 +878,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
         
-        public void SendGroupVoteHistory(IClientAPI sender,UUID agentID, UUID sessionID, UUID groupID, UUID transactionID, Dictionary<int, string> VoteID, Dictionary<int, string> VoteInitiator, Dictionary<int, string> Majority, Dictionary<int, string> Quorum, Dictionary<int, string> TerseDateID, Dictionary<int, string> StartDateTime, Dictionary<int, string> EndDateTime, Dictionary<int, string> VoteType, Dictionary<int, string> VoteResult, Dictionary<int, string> ProposalText)
-        {
-            foreach (KeyValuePair<int, string> Blank in VoteID)
+        public void SendGroupVoteHistory(IClientAPI sender,UUID agentID, UUID sessionID, UUID groupID, UUID transactionID, string[] VoteID, string[] VoteInitiator, string[] Majority, string[] Quorum, string[] TerseDateID, string[] StartDateTime, string[] EndDateTime, string[] VoteType, string[] VoteResult, string[] ProposalText)
+        {

+            int i = 0;
+            foreach (string voteID in VoteID)
             {
-            GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket();
+                GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket();
             
-            GVHIRP.AgentData.AgentID = agentID;
-            GVHIRP.AgentData.GroupID = groupID;
-            GVHIRP.TransactionData.TransactionID = transactionID;
-            GVHIRP.TransactionData.TotalNumItems = 1;
-            GVHIRP.HistoryItemData.VoteID = new UUID(VoteID[Blank.Key]);
-            GVHIRP.HistoryItemData.VoteInitiator = new UUID(VoteInitiator[Blank.Key]);
-            GVHIRP.HistoryItemData.Majority = (float)Convert.ToInt32(Majority[Blank.Key]);
-            GVHIRP.HistoryItemData.Quorum = Convert.ToInt32(Quorum[Blank.Key]);
-            GVHIRP.HistoryItemData.TerseDateID = Utils.StringToBytes(TerseDateID[Blank.Key]);
-            GVHIRP.HistoryItemData.StartDateTime = Utils.StringToBytes(StartDateTime[Blank.Key]);
-            GVHIRP.HistoryItemData.EndDateTime = Utils.StringToBytes(EndDateTime[Blank.Key]);
-            GVHIRP.HistoryItemData.VoteType = Utils.StringToBytes(VoteType[Blank.Key]);
-            GVHIRP.HistoryItemData.VoteResult = Utils.StringToBytes(VoteResult[Blank.Key]);
-            GVHIRP.HistoryItemData.ProposalText = Utils.StringToBytes(ProposalText[Blank.Key]);
-            GroupVoteHistoryItemReplyPacket.VoteItemBlock VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock();
-            GVHIRP.VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock[1];
-            VoteItem.CandidateID = UUID.Zero;
-            VoteItem.NumVotes = 0; //TODO: FIX THIS!!!
-            VoteItem.VoteCast = Utils.StringToBytes("Yes");
-            GVHIRP.VoteItem[0] = VoteItem;
-            OutPacket(GVHIRP, ThrottleOutPacketType.Task);
-            }
-            if (VoteID.Count == 0)
+                GVHIRP.AgentData.AgentID = agentID;
+                GVHIRP.AgentData.GroupID = groupID;
+                GVHIRP.TransactionData.TransactionID = transactionID;
+                GVHIRP.TransactionData.TotalNumItems = ((uint)i+1);
+                GVHIRP.HistoryItemData.VoteID = new UUID(VoteID[i]);
+                GVHIRP.HistoryItemData.VoteInitiator = new UUID(VoteInitiator[i]);
+                GVHIRP.HistoryItemData.Majority = (float)Convert.ToInt32(Majority[i]);
+                GVHIRP.HistoryItemData.Quorum = Convert.ToInt32(Quorum[i]);
+                GVHIRP.HistoryItemData.TerseDateID = Utils.StringToBytes(TerseDateID[i]);
+                GVHIRP.HistoryItemData.StartDateTime = Utils.StringToBytes(StartDateTime[i]);
+                GVHIRP.HistoryItemData.EndDateTime = Utils.StringToBytes(EndDateTime[i]);
+                GVHIRP.HistoryItemData.VoteType = Utils.StringToBytes(VoteType[i]);
+                GVHIRP.HistoryItemData.VoteResult = Utils.StringToBytes(VoteResult[i]);
+                GVHIRP.HistoryItemData.ProposalText = Utils.StringToBytes(ProposalText[i]);
+                GroupVoteHistoryItemReplyPacket.VoteItemBlock VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock();
+                GVHIRP.VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock[1];
+                VoteItem.CandidateID = UUID.Zero;
+                VoteItem.NumVotes = 0; //TODO: FIX THIS!!!
+                VoteItem.VoteCast = Utils.StringToBytes("Yes");
+                GVHIRP.VoteItem[i] = VoteItem;
+                OutPacket(GVHIRP, ThrottleOutPacketType.Task);

+                i++;
+            }
+            if (VoteID.Length == 0)
             {
                 GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket();
                 
@@ -4892,7 +4896,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             FreezeUserPacket FreezeUser = (FreezeUserPacket)Packet;
             
-            FreezeUserUpdate FreezeUserHandler = OnParcelFreezeUserEvent;
+            FreezeUserUpdate FreezeUserHandler = OnParcelFreezeUser;
             if (FreezeUserHandler != null)
             {
                 FreezeUserHandler(this,
@@ -4909,7 +4913,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             EjectUserPacket EjectUser =
                 (EjectUserPacket)Packet;
             
-            EjectUserUpdate EjectUserHandler = OnParcelEjectUserEvent;
+            EjectUserUpdate EjectUserHandler = OnParcelEjectUser;
             if (EjectUserHandler != null)
             {
                 EjectUserHandler(this,
@@ -5308,7 +5312,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             FindAgentPacket FindAgent =
                 (FindAgentPacket)Packet;
             
-            FindAgentUpdate FindAgentHandler = OnFindAgentEvent;
+            FindAgentUpdate FindAgentHandler = OnFindAgent;
             if (FindAgentHandler != null)
             {
                 FindAgentHandler(this,FindAgent.AgentBlock.Hunter,FindAgent.AgentBlock.Prey);
@@ -5322,7 +5326,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             TrackAgentPacket TrackAgent =
                 (TrackAgentPacket)Packet;
             
-            TrackAgentUpdate TrackAgentHandler = OnTrackAgentEvent;
+            TrackAgentUpdate TrackAgentHandler = OnTrackAgent;
             if (TrackAgentHandler != null)
             {
                 TrackAgentHandler(this,
@@ -8608,7 +8612,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             GodUpdateRegionInfoPacket GodUpdateRegionInfo =
                 (GodUpdateRegionInfoPacket)Packet;
 
-            GodUpdateRegionInfoUpdate handlerGodUpdateRegionInfo = OnGodUpdateRegionInfoUpdateEvent;
+            GodUpdateRegionInfoUpdate handlerGodUpdateRegionInfo = OnGodUpdateRegionInfoUpdate;
             if (handlerGodUpdateRegionInfo != null)
             {
                 handlerGodUpdateRegionInfo(this,
@@ -8641,7 +8645,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             GodlikeMessagePacket GodlikeMessage =
                 (GodlikeMessagePacket)Packet;
 
-            GodlikeMessage handlerGodlikeMessage = onGodlikeMessageEvent;
+            GodlikeMessage handlerGodlikeMessage = onGodlikeMessage;
             if (handlerGodlikeMessage != null)
             {
                 handlerGodlikeMessage(this,
@@ -8657,7 +8661,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             StateSavePacket SaveStateMessage =
                 (StateSavePacket)Packet;
-            SaveStateHandler handlerSaveStatePacket = OnSaveStateEvent;
+            SaveStateHandler handlerSaveStatePacket = OnSaveState;
             if (handlerSaveStatePacket != null)
             {
                 handlerSaveStatePacket(this,SaveStateMessage.AgentData.AgentID);
@@ -9021,7 +9025,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             UpdateMuteListEntryPacket UpdateMuteListEntry =
                 (UpdateMuteListEntryPacket)Packet;
-            MuteListEntryUpdate handlerUpdateMuteListEntry = OnUpdateMuteListEntryEvent;
+            MuteListEntryUpdate handlerUpdateMuteListEntry = OnUpdateMuteListEntry;
             if (handlerUpdateMuteListEntry != null)
             {
                 handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID,
@@ -9037,7 +9041,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             RemoveMuteListEntryPacket RemoveMuteListEntry =
                 (RemoveMuteListEntryPacket)Packet;
-            MuteListEntryRemove handlerRemoveMuteListEntry = OnRemoveMuteListEntryEvent;
+            MuteListEntryRemove handlerRemoveMuteListEntry = OnRemoveMuteListEntry;
             if (handlerRemoveMuteListEntry != null)
             {
                 handlerRemoveMuteListEntry(this,
@@ -9054,7 +9058,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             UserReportPacket UserReport =
                 (UserReportPacket)Packet;
 
-            NewUserReport handlerUserReport = OnUserReportEvent;
+            NewUserReport handlerUserReport = OnUserReport;
             if (handlerUserReport != null)
             {
                 handlerUserReport(this,