From 9a7d68cfce5f71cf9d89536431d72941dc369749 Mon Sep 17 00:00:00 2001
From: Dave Hiller <daveh@lindenlab.com>
Date: Thu, 31 Jul 2008 12:15:15 +0000
Subject: svn merge -r93014:93396
 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633
 dataserver-is-deprecated

---
 etc/message.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'etc')

diff --git a/etc/message.xml b/etc/message.xml
index f6f43bd0ff..80dc5607c0 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -449,6 +449,14 @@
 					<key>trusted-sender</key>
 					<boolean>false</boolean>
 				</map>
+				
+				<key>LandStatReply</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>false</boolean>
+				</map>
 
 				<key>StartGroupProposal</key>
 				<map>
@@ -493,7 +501,7 @@
 			<boolean>false</boolean>
 
 			<key>UpdateScriptAgentInventory</key>
-			<boolean>true</boolean>
+			<boolean>false</boolean>
 
 			<key>UpdateGestureTaskInventory</key>
 			<boolean>false</boolean>
@@ -502,7 +510,7 @@
 			<boolean>true</boolean>
 
 			<key>UpdateScriptTaskInventory</key>
-			<boolean>true</boolean>
+			<boolean>false</boolean>
 
 			<key>ViewerStartAuction</key>
 			<boolean>true</boolean>
-- 
cgit v1.2.3