diff options
| author | Eli Linden <eli@lindenlab.com> | 2011-03-10 12:18:27 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2011-03-10 12:18:27 -0800 |
| commit | 70aff7fd157b1e2894a4d065caf9a63848d072b0 (patch) | |
| tree | dee262d1b7ac3ef14eebeb71d55e9b0755209148 /indra/newview/llinventorymodelbackgroundfetch.cpp | |
| parent | 64e672d9d92d1b8f92e968b0164b2212a71120da (diff) | |
| parent | 378585e7f089b62b7a0dd69adde48cd63fc7bacc (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; |