summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodelbackgroundfetch.cpp
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-04-14 14:10:38 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-04-14 14:10:38 +0300
commit8be5c8eade832796c34f035547cf09095a85d3f4 (patch)
treecebc6711a25bb86a358c062a9a4fd47da2cec4a6 /indra/newview/llinventorymodelbackgroundfetch.cpp
parenta647b8f1cbab13f07ea889c80df28414bc906129 (diff)
MAINT-5090 Remove disabling HTTP Inventory from Viewer
Diffstat (limited to 'indra/newview/llinventorymodelbackgroundfetch.cpp')
-rwxr-xr-xindra/newview/llinventorymodelbackgroundfetch.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index f18832fe95..5fc8b1851a 100755
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -351,13 +351,9 @@ void LLInventoryModelBackgroundFetch::backgroundFetch()
if (mBackgroundFetchActive && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived())
{
// If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
- if (gSavedSettings.getBOOL("UseHTTPInventory"))
- {
- bulkFetch();
- return;
- }
+ bulkFetch();
-#if 1
+#if 0
//--------------------------------------------------------------------------------
// DEPRECATED OLD CODE
//