diff options
| author | Tofu Buzzard <no-email> | 2011-03-16 22:44:18 +0000 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-16 22:44:18 +0000 |
| commit | 752b3fdbe044069635a2c6cd000c481561985954 (patch) | |
| tree | a162616b10fbabe65bf3a568c408e10e3cfd253a /indra/newview/llinventorymodelbackgroundfetch.cpp | |
| parent | b092de554c7745d7c3c19bd30803640f36431da2 (diff) | |
| parent | 4b54ec7965cd874af4d0eef381d0bc9fe06cff04 (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; |