From ed386ae547c225e352c39e8d14921572ee534b0b Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 18 Jul 2008 17:50:25 +0000
Subject: merge support-featurettes-snapshot-merge-2 for QAR-754, includes:    
 * featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and
 part of -4)     * gteam-showstoppers-3 91950:91951 (which is all of
 gteam-showstoppers-1, -2, and -3)     * featurettes-5 92149:92150 (patch for
 last line of chat text not visible in chat history, DEV-17771)     *
 snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)

Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry

* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes
---
 etc/message.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'etc')

diff --git a/etc/message.xml b/etc/message.xml
index 701d049678..f6f43bd0ff 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -360,6 +360,14 @@
 					<boolean>true</boolean>
 				</map>
 				
+				<key>ParcelObjectOwnersReply</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>true</boolean>
+				</map>
+
 				<key>ParcelProperties</key>
 				<map>
 					<key>flavor</key>
@@ -368,6 +376,14 @@
 					<boolean>true</boolean>
 				</map>
 
+				<key>LandStatReply</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>true</boolean>
+				</map>
+
 				<key>avatarnotesrequest</key>
 				<map>
 					<key>service_name</key>
-- 
cgit v1.2.3