From bdb74add3c88295dfbc600e55dfd52f94db112c3 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Wed, 1 May 2013 02:29:34 +0200
Subject: [PATCH] Spot-fix the CAPS issue preventing UseHTTPInventory debug
 setting from working.

---
 indra/newview/llviewerregion.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 70f432f02..dbcbe992a 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -247,6 +247,14 @@ public:
 		LLSD::map_const_iterator iter;
 		for(iter = content.beginMap(); iter != content.endMap(); ++iter)
 		{
+			if (!gSavedSettings.getBOOL("UseHTTPInventory"))
+			{
+				if (iter->first == "FetchLib2" ||
+					iter->first == "FetchLibDescendents2" ||
+					iter->first == "FetchInventory2" ||
+					iter->first == "FetchInventoryDescendents2")
+					continue;
+			}
 			regionp->setCapability(iter->first, iter->second);
 			LL_DEBUGS2("AppInit", "Capabilities") << "got capability for " 
 				<< iter->first << LL_ENDL;