EFFECTIVE MERGE: svn merge -r 73781:75018...

EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/FixGroupVotes into release
ACTUAL MERGE: svn merge -r 75163:75166 svn+ssh://svn/svn/linden/qa/FixGroupVotes-merge-75160 into release

etc/message.xml

@@ -408,6 +408,22 @@
 					<boolean>false</boolean>
 				</map>
 
+				<key>StartGroupProposal</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>false</boolean>
+				</map>
+				
+				<key>GroupProposalBallot</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>false</boolean>
+				</map>
+
 		  </map>
   	  	<key>capBans</key>
     	<map>

indra/newview/llviewerregion.cpp

@@ -1340,6 +1340,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
 	capabilityNames.append("CopyInventoryFromNotecard");
 	capabilityNames.append("DispatchRegionInfo");
 	capabilityNames.append("EventQueueGet");
+	capabilityNames.append("GroupProposalBallot");
 	capabilityNames.append("MapLayer");
 	capabilityNames.append("MapLayerGod");
 	capabilityNames.append("NewFileAgentInventory");
@@ -1354,6 +1355,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
 	capabilityNames.append("SendUserReport");
 	capabilityNames.append("SendUserReportWithScreenshot");
 	capabilityNames.append("ServerReleaseNotes");
+	capabilityNames.append("StartGroupProposal");
 	capabilityNames.append("UpdateGestureAgentInventory");
 	capabilityNames.append("UpdateNotecardAgentInventory");
 	capabilityNames.append("UpdateScriptAgentInventory");

scripts/messages/message_template.msg

@@ -7708,7 +7708,7 @@ version 2.0
 // viewer -> simulator -> dataserver
 // reliable
 {
-	StartGroupProposal Low 363 NotTrusted Zerocoded
+	StartGroupProposal Low 363 NotTrusted Zerocoded UDPDeprecated
 	{
 		AgentData		Single
 		{	AgentID		LLUUID	}
@@ -7728,7 +7728,7 @@ version 2.0
 // viewer -> simulator -> dataserver
 // reliable
 {
-	GroupProposalBallot Low 364 NotTrusted Unencoded
+	GroupProposalBallot Low 364 NotTrusted Unencoded UDPDeprecated
 	{
 		AgentData		Single
 		{	AgentID		LLUUID			}