From 25dd719e39fbec3452475c38ad1e4b08c2b5ac36 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Fri, 3 May 2013 19:39:54 +0200 Subject: [PATCH] Revert "Spot-fix the CAPS issue preventing UseHTTPInventory debug setting from working." On-the-fly switching of UseHTTPInventory provided in patch by Aleric. This reverts commit bdb74add3c88295dfbc600e55dfd52f94db112c3. --- indra/newview/llviewerregion.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index dbcbe992a..70f432f02 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -247,14 +247,6 @@ 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;