diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-09 11:52:43 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-09 11:52:43 -0800 |
| commit | 90c824d10dbf4468dfdd9ffebf7456f81964391a (patch) | |
| tree | 812cc4dd06d128fbbf1e7c960f96e5476eb925f6 /indra/newview/llinventorymodelbackgroundfetch.cpp | |
| parent | 6158929e3ee87bc879c99d35963a151006394ed7 (diff) | |
| parent | f47a9a4ea3d40ecaf03e853469b1570a4ad72ce7 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventorymodelbackgroundfetch.cpp')
| -rw-r--r-- | indra/newview/llinventorymodelbackgroundfetch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 570e48d526..e31360fcbc 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -182,7 +182,7 @@ void LLInventoryModelBackgroundFetch::backgroundFetch() { // If we'll be using the capability, we'll be sending batches and the background thing isn't as important. std::string url = gAgent.getRegion()->getCapability("FetchInventoryDescendents2"); - if (!url.empty()) + if (gSavedSettings.getBOOL("UseHTTPInventory") && !url.empty()) { bulkFetch(url); return; |