diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:51:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:51:41 -0400 |
| commit | c5ae838ce3cd8521b7b4817f153560e03a8dcc32 (patch) | |
| tree | 7a489631ed3811ae52fab7bbf6b5a1075aa20e65 /indra/newview/llinventorymodelbackgroundfetch.cpp | |
| parent | ba0c369aa20cdbfd7940a2435dd3c6630f0d54ae (diff) | |
| parent | 4047349ade461fa6bac43da2a14c6e7689918aa1 (diff) | |
pull improved avatar physics ui and other improvements from Seraph
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; |