3 files changed, 19 insertions, 4 deletions
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>
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 3eab85b8b3..d45512df9c 100755
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -627,6 +627,10 @@ S32 LLViewerInventoryCategory::getVersion() const
 
 void LLViewerInventoryCategory::setVersion(S32 version)
 {
+	if (mPreferredType == LLFolderType::FT_CURRENT_OUTFIT)
+	{
+		llinfos << "cof version change " << mVersion << " => " << version << llendl;
+	}
 	mVersion = version;
 }
 
@@ -1189,7 +1193,7 @@ void remove_inventory_item(
 	if(obj)
 	{
 		std::string cap;
-		if (gAgent.getRegion())
+		if (gAgent.getRegion() && gSavedSettings.getBOOL("UseAISv3Inventory"))
 		{
 			cap = gAgent.getRegion()->getCapability("InventoryAPIv3");
 		}
@@ -1267,7 +1271,7 @@ void remove_inventory_category(
 		}
 
 		std::string cap;
-		if (gAgent.getRegion())
+		if (gAgent.getRegion() && gSavedSettings.getBOOL("UseAISv3Inventory"))
 		{
 			cap = gAgent.getRegion()->getCapability("InventoryAPIv3");
 		}
@@ -1409,7 +1413,7 @@ void purge_descendents_of(const LLUUID& id, LLPointer<LLInventoryCallback> cb)
 		else
 		{
 			std::string cap;
-			if (gAgent.getRegion())
+			if (gAgent.getRegion() && gSavedSettings.getBOOL("UseAISv3Inventory"))
 			{
 				cap = gAgent.getRegion()->getCapability("InventoryAPIv3");
 			}