From 9754d265eb70a0e137cce1562df8d59dd74093af Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Thu, 6 Dec 2007 18:18:35 +0000
Subject: 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 | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'etc')

diff --git a/etc/message.xml b/etc/message.xml
index 18f61198ce..4534be6db8 100644
--- a/etc/message.xml
+++ b/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>
-- 
cgit v1.2.3