aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/GroupData.cs26
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs68
2 files changed, 60 insertions, 34 deletions
diff --git a/OpenSim/Framework/GroupData.cs b/OpenSim/Framework/GroupData.cs
index 247420e..e3b8626 100644
--- a/OpenSim/Framework/GroupData.cs
+++ b/OpenSim/Framework/GroupData.cs
@@ -135,4 +135,30 @@ namespace OpenSim.Framework
135 public bool HasAttachment; 135 public bool HasAttachment;
136 public byte AssetType; 136 public byte AssetType;
137 } 137 }
138
139 public struct GroupVoteHistory
140 {
141 public string VoteID;
142 public string VoteInitiator;
143 public string Majority;
144 public string Quorum;
145 public string TerseDateID;
146 public string StartDateTime;
147 public string EndDateTime;
148 public string VoteType;
149 public string VoteResult;
150 public string ProposalText;
151 }
152
153 public struct GroupActiveProposals
154 {
155 public string VoteID;
156 public string VoteInitiator;
157 public string Majority;
158 public string Quorum;
159 public string TerseDateID;
160 public string StartDateTime;
161 public string EndDateTime;
162 public string ProposalText;
163 }
138} 164}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 5eaaf12..7d90a68 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -825,39 +825,39 @@ namespace OpenSim.Region.ClientStack.LindenUDP
825 } 825 }
826 OutPacket(gmp, ThrottleOutPacketType.Task); 826 OutPacket(gmp, ThrottleOutPacketType.Task);
827 } 827 }
828 828
829 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) 829 public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
830 { 830 {
831 int i = 0; 831 int i = 0;
832 foreach (string voteID in VoteID) 832 foreach (GroupActiveProposals Proposal in Proposals)
833 { 833 {
834 GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket(); 834 GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket();
835 835
836 GAPIRP.AgentData.AgentID = agentID; 836 GAPIRP.AgentData.AgentID = AgentId;
837 GAPIRP.AgentData.GroupID = groupID; 837 GAPIRP.AgentData.GroupID = groupID;
838 GAPIRP.TransactionData.TransactionID = transactionID; 838 GAPIRP.TransactionData.TransactionID = transactionID;
839 GAPIRP.TransactionData.TotalNumItems = ((uint)i+1); 839 GAPIRP.TransactionData.TotalNumItems = ((uint)i+1);
840 GroupActiveProposalItemReplyPacket.ProposalDataBlock ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock(); 840 GroupActiveProposalItemReplyPacket.ProposalDataBlock ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock();
841 GAPIRP.ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock[1]; 841 GAPIRP.ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock[1];
842 ProposalData.VoteCast = Utils.StringToBytes("false"); 842 ProposalData.VoteCast = Utils.StringToBytes("false");
843 ProposalData.VoteID = new UUID(VoteID[i]); 843 ProposalData.VoteID = new UUID(Proposal.VoteID);
844 ProposalData.VoteInitiator = new UUID(VoteInitiator[i]); 844 ProposalData.VoteInitiator = new UUID(Proposal.VoteInitiator);
845 ProposalData.Majority = (float)Convert.ToInt32(Majority[i]); 845 ProposalData.Majority = (float)Convert.ToInt32(Proposal.Majority);
846 ProposalData.Quorum = Convert.ToInt32(Quorum[i]); 846 ProposalData.Quorum = Convert.ToInt32(Proposal.Quorum);
847 ProposalData.TerseDateID = Utils.StringToBytes(TerseDateID[i]); 847 ProposalData.TerseDateID = Utils.StringToBytes(Proposal.TerseDateID);
848 ProposalData.StartDateTime = Utils.StringToBytes(StartDateTime[i]); 848 ProposalData.StartDateTime = Utils.StringToBytes(Proposal.StartDateTime);
849 ProposalData.EndDateTime = Utils.StringToBytes(EndDateTime[i]); 849 ProposalData.EndDateTime = Utils.StringToBytes(Proposal.EndDateTime);
850 ProposalData.ProposalText = Utils.StringToBytes(ProposalText[i]); 850 ProposalData.ProposalText = Utils.StringToBytes(Proposal.ProposalText);
851 ProposalData.AlreadyVoted = false; 851 ProposalData.AlreadyVoted = false;
852 GAPIRP.ProposalData[i] = ProposalData; 852 GAPIRP.ProposalData[i] = ProposalData;
853 OutPacket(GAPIRP, ThrottleOutPacketType.Task); 853 OutPacket(GAPIRP, ThrottleOutPacketType.Task);
854 i++; 854 i++;
855 } 855 }
856 if (VoteID.Length == 0) 856 if (Proposals.Length == 0)
857 { 857 {
858 GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket(); 858 GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket();
859 859
860 GAPIRP.AgentData.AgentID = agentID; 860 GAPIRP.AgentData.AgentID = AgentId;
861 GAPIRP.AgentData.GroupID = groupID; 861 GAPIRP.AgentData.GroupID = groupID;
862 GAPIRP.TransactionData.TransactionID = transactionID; 862 GAPIRP.TransactionData.TransactionID = transactionID;
863 GAPIRP.TransactionData.TotalNumItems = 1; 863 GAPIRP.TransactionData.TotalNumItems = 1;
@@ -877,42 +877,42 @@ namespace OpenSim.Region.ClientStack.LindenUDP
877 OutPacket(GAPIRP, ThrottleOutPacketType.Task); 877 OutPacket(GAPIRP, ThrottleOutPacketType.Task);
878 } 878 }
879 } 879 }
880 880
881 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) 881 public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
882 { 882 {
883 int i = 0; 883 int i = 0;
884 foreach (string voteID in VoteID) 884 foreach (GroupVoteHistory Vote in Votes)
885 { 885 {
886 GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket(); 886 GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket();
887 887
888 GVHIRP.AgentData.AgentID = agentID; 888 GVHIRP.AgentData.AgentID = AgentId;
889 GVHIRP.AgentData.GroupID = groupID; 889 GVHIRP.AgentData.GroupID = groupID;
890 GVHIRP.TransactionData.TransactionID = transactionID; 890 GVHIRP.TransactionData.TransactionID = transactionID;
891 GVHIRP.TransactionData.TotalNumItems = ((uint)i+1); 891 GVHIRP.TransactionData.TotalNumItems = ((uint)i+1);
892 GVHIRP.HistoryItemData.VoteID = new UUID(VoteID[i]); 892 GVHIRP.HistoryItemData.VoteID = new UUID(Vote.VoteID);
893 GVHIRP.HistoryItemData.VoteInitiator = new UUID(VoteInitiator[i]); 893 GVHIRP.HistoryItemData.VoteInitiator = new UUID(Vote.VoteInitiator);
894 GVHIRP.HistoryItemData.Majority = (float)Convert.ToInt32(Majority[i]); 894 GVHIRP.HistoryItemData.Majority = (float)Convert.ToInt32(Vote.Majority);
895 GVHIRP.HistoryItemData.Quorum = Convert.ToInt32(Quorum[i]); 895 GVHIRP.HistoryItemData.Quorum = Convert.ToInt32(Vote.Quorum);
896 GVHIRP.HistoryItemData.TerseDateID = Utils.StringToBytes(TerseDateID[i]); 896 GVHIRP.HistoryItemData.TerseDateID = Utils.StringToBytes(Vote.TerseDateID);
897 GVHIRP.HistoryItemData.StartDateTime = Utils.StringToBytes(StartDateTime[i]); 897 GVHIRP.HistoryItemData.StartDateTime = Utils.StringToBytes(Vote.StartDateTime);
898 GVHIRP.HistoryItemData.EndDateTime = Utils.StringToBytes(EndDateTime[i]); 898 GVHIRP.HistoryItemData.EndDateTime = Utils.StringToBytes(Vote.EndDateTime);
899 GVHIRP.HistoryItemData.VoteType = Utils.StringToBytes(VoteType[i]); 899 GVHIRP.HistoryItemData.VoteType = Utils.StringToBytes(Vote.VoteType);
900 GVHIRP.HistoryItemData.VoteResult = Utils.StringToBytes(VoteResult[i]); 900 GVHIRP.HistoryItemData.VoteResult = Utils.StringToBytes(Vote.VoteResult);
901 GVHIRP.HistoryItemData.ProposalText = Utils.StringToBytes(ProposalText[i]); 901 GVHIRP.HistoryItemData.ProposalText = Utils.StringToBytes(Vote.ProposalText);
902 GroupVoteHistoryItemReplyPacket.VoteItemBlock VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock(); 902 GroupVoteHistoryItemReplyPacket.VoteItemBlock VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock();
903 GVHIRP.VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock[1]; 903 GVHIRP.VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock[1];
904 VoteItem.CandidateID = UUID.Zero; 904 VoteItem.CandidateID = UUID.Zero;
905 VoteItem.NumVotes = 0; //TODO: FIX THIS!!! 905 VoteItem.NumVotes = 0; //TODO: FIX THIS!!!
906 VoteItem.VoteCast = Utils.StringToBytes("Yes"); 906 VoteItem.VoteCast = Utils.StringToBytes("Yes");
907 GVHIRP.VoteItem[i] = VoteItem; 907 GVHIRP.VoteItem[i] = VoteItem;
908 OutPacket(GVHIRP, ThrottleOutPacketType.Task); 908 OutPacket(GVHIRP, ThrottleOutPacketType.Task);
909 i++; 909 i++;
910 } 910 }
911 if (VoteID.Length == 0) 911 if (Votes.Length == 0)
912 { 912 {
913 GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket(); 913 GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket();
914 914
915 GVHIRP.AgentData.AgentID = agentID; 915 GVHIRP.AgentData.AgentID = AgentId;
916 GVHIRP.AgentData.GroupID = groupID; 916 GVHIRP.AgentData.GroupID = groupID;
917 GVHIRP.TransactionData.TransactionID = transactionID; 917 GVHIRP.TransactionData.TransactionID = transactionID;
918 GVHIRP.TransactionData.TotalNumItems = 0; 918 GVHIRP.TransactionData.TotalNumItems = 0;