From 98fd90ddd6595f2ee7e626c14117f51def621ec5 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 14 Feb 2008 01:45:59 +0000
Subject: svn merge -r 79730:79944
 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6
 --> release

QAR-275 Parcel Media

Sam made me do it.
---
 etc/message.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/message.xml b/etc/message.xml
index ddbfa58ddb..c9b9220ba2 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -357,6 +357,14 @@
 					<key>trusted-sender</key>
 					<boolean>true</boolean>
 				</map>
+				
+				<key>ParcelProperties</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>true</boolean>
+				</map>
 
 				<key>avatarnotesrequest</key>
 				<map>
@@ -514,7 +522,10 @@
 
 			<key>SearchStatTracking</key>
 			<boolean>false</boolean>
-
+			
+			<key>ParcelPropertiesUpdate</key>
+			<boolean>false</boolean>
+		
 		</map>
 
 		<key>messageBans</key>
-- 
cgit v1.2.3