diff options
| author | Richard Linden <none@none> | 2011-03-08 16:47:42 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-08 16:47:42 -0800 |
| commit | bc22d31caee8479a89366155062df45302021bba (patch) | |
| tree | 2989fdee4329b37d75e728030466d129efa09241 /indra/newview/llinventorymodelbackgroundfetch.cpp | |
| parent | 0e5fd6a1483e12a46dc94f318f3e43ec328def54 (diff) | |
| parent | f3e37e047206b909c212a02493be6972fba2c8aa (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social/
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; |