From 931410211e1d644028f5b09cbf77b179e0e75aab Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 15 May 2013 09:45:10 -0400
Subject: SH-4144 FIX - removed UseAISv3Inventory debug settings - cap is now
 managed sim-side

---
 indra/newview/app_settings/settings.xml | 11 -----------
 indra/newview/llviewerinventory.cpp     |  6 +++---
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1262089b3d..18a33b3542 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14033,17 +14033,6 @@
       <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>
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 5ffd560942..e819479923 100755
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1189,7 +1189,7 @@ void remove_inventory_item(
 	if(obj)
 	{
 		std::string cap;
-		if (gAgent.getRegion() && gSavedSettings.getBOOL("UseAISv3Inventory"))
+		if (gAgent.getRegion())
 		{
 			cap = gAgent.getRegion()->getCapability("InventoryAPIv3");
 		}
@@ -1267,7 +1267,7 @@ void remove_inventory_category(
 		}
 
 		std::string cap;
-		if (gAgent.getRegion() && gSavedSettings.getBOOL("UseAISv3Inventory"))
+		if (gAgent.getRegion())
 		{
 			cap = gAgent.getRegion()->getCapability("InventoryAPIv3");
 		}
@@ -1407,7 +1407,7 @@ void purge_descendents_of(const LLUUID& id, LLPointer<LLInventoryCallback> cb)
 		else
 		{
 			std::string cap;
-			if (gAgent.getRegion() && gSavedSettings.getBOOL("UseAISv3Inventory"))
+			if (gAgent.getRegion())
 			{
 				cap = gAgent.getRegion()->getCapability("InventoryAPIv3");
 			}
-- 
cgit v1.2.3