From e4c96827d237a489873ce8453640d3a13f83d01a Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 29 Apr 2013 14:24:05 -0400
Subject: SH-4144 FIX - Debug setting now disables use of AISv3 by default.
 This is just a workaround for the problem of aditi advertising the cap when
 it isn't really present. Once we have aditi in a consistent state we should
 remove the setting, or at least default it to true.

---
 indra/newview/app_settings/logcontrol.xml |  2 +-
 indra/newview/app_settings/settings.xml   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 92a241857e..c5561166fc 100755
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -42,8 +42,8 @@
 						</array>
 					<key>tags</key>
 						<array>
-						<!-- sample entry for debugging specific items	
 						     <string>Avatar</string>
+						<!-- sample entry for debugging specific items	
 						     <string>Voice</string>		
 						-->
 						</array>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 18a33b3542..1262089b3d 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14033,6 +14033,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>UseAISv3Inventory</key>
+    <map>
+      <key>Comment</key>
+      <string>Allow use of AISv3 inventory - this setting should only be needed during development.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ClickToWalk</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3