From 43f22fff6f687158a266f4ee2d12aaa019c3c415 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Tue, 24 Mar 2009 19:13:58 +0000
Subject: Result of svn merge -r115023:115025
 svn+ssh://svn/svn/linden/branches/no_free_uploads/merge_qa_2 into
 svn+ssh://svn/svn/linden/trunk for QAR-1220

---
 etc/message.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/message.xml b/etc/message.xml
index ddfd3e982e..d8fb06b060 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -566,7 +566,7 @@
 			<boolean>false</boolean>
 
 			<key>UpdateNotecardTaskInventory</key>
-			<boolean>true</boolean>
+			<boolean>false</boolean>
 
 			<key>UpdateScriptTaskInventory</key>
 			<boolean>false</boolean>
-- 
cgit v1.2.3