diff options
author | Don Kjer <don@lindenlab.com> | 2007-12-06 18:18:35 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2007-12-06 18:18:35 +0000 |
commit | 9754d265eb70a0e137cce1562df8d59dd74093af (patch) | |
tree | a2c13c9955fbb1d72fd1ba45a426ba927b1f6737 /etc | |
parent | facf67ae3226105910c983a8fa8760414bf703e9 (diff) |
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
Diffstat (limited to 'etc')
-rw-r--r-- | etc/message.xml | 16 |
1 files changed, 16 insertions, 0 deletions
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> |