diff options
| author | Jonathan Yap <none@none> | 2011-03-19 16:29:32 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-03-19 16:29:32 -0400 |
| commit | fbd241da54ad6017825b59c5b0c71086d8b8957a (patch) | |
| tree | 34051dba97afece2416f25954080011d922d910e /indra/newview/llinventorymodelbackgroundfetch.cpp | |
| parent | 834d0f1ed612c8644e642103096daf7f0b0f44c9 (diff) | |
| parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) | |
STORM-1019 Resolve merge conflicts
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; |