summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodelbackgroundfetch.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2012-11-06 18:18:27 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2012-11-06 18:18:27 -0500
commitc3b00d4063fe4f85ec293b98750735b94776c4fe (patch)
treed49e13d60af8bf9b346536623ccae7bee3602eea /indra/newview/llinventorymodelbackgroundfetch.cpp
parent85e03582b21aef8a74613d14d5dcde63cf476cdb (diff)
parentee2bc008ea8f04ffd1271787382a2b756e6293aa (diff)
merge
Diffstat (limited to 'indra/newview/llinventorymodelbackgroundfetch.cpp')
-rw-r--r--indra/newview/llinventorymodelbackgroundfetch.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index f4d0110b0f..eb92902de9 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -183,7 +183,7 @@ void LLInventoryModelBackgroundFetch::backgroundFetchCB(void *)
void LLInventoryModelBackgroundFetch::backgroundFetch()
{
- if (mBackgroundFetchActive && gAgent.getRegion())
+ if (mBackgroundFetchActive && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived())
{
// If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
if (gSavedSettings.getBOOL("UseHTTPInventory"))