From 8be5c8eade832796c34f035547cf09095a85d3f4 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 14 Apr 2015 14:10:38 +0300 Subject: MAINT-5090 Remove disabling HTTP Inventory from Viewer --- indra/newview/llinventorymodelbackgroundfetch.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'indra/newview/llinventorymodelbackgroundfetch.cpp') 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 // -- cgit v1.2.3