From 7dd08303a3ebf9718c2c60a4d94b81d5d7845f8c Mon Sep 17 00:00:00 2001
From: Jon Wolk <jwolk@lindenlab.com>
Date: Wed, 19 Dec 2007 00:56:59 +0000
Subject: svn merge -r 75354:76103
 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 ->
 release.  Finished product of QAR-134

---
 etc/message.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/message.xml b/etc/message.xml
index 4534be6db8..ddbfa58ddb 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -284,6 +284,14 @@
 					<boolean>true</boolean>
 				</map>
 
+				<key>AgentDropGroup</key>
+				<map>
+				    <key>flavor</key>
+				    <string>llsd</string>
+				    <key>trusted-sender</key>
+				    <boolean>true</boolean>
+				</map>
+
 				<key>ChatterBoxSessionStartReply</key>
 				<map>
 					<key>flavor</key>
@@ -315,7 +323,15 @@
 					<key>trusted-sender</key>
 					<boolean>true</boolean>
 				</map>
-
+				
+				<key>ChatterBoxSessionUpdate</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>true</boolean>
+				</map>
+				
 				<key>ChatterBoxInvitation</key>
 				<map>
 					<key>flavor</key>
-- 
cgit v1.2.3