diff options
| author | Logan Dethrow <log@lindenlab.com> | 2012-11-15 15:20:46 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2012-11-15 15:20:46 -0500 |
| commit | 79dbaed1581a5d8212caebf6b6a3672660e2f5a9 (patch) | |
| tree | c3c539a8ce3ccfb4d7d1a66b58b56fce9b5c293b /indra/newview/llinventorymodelbackgroundfetch.cpp | |
| parent | f93604c399c889e06980554e1cb59a833e7f847d (diff) | |
| parent | 51a016a0cc6928dd2a685ce22dd6475e2610a5c5 (diff) | |
Merge lindenlab/sunshine-internal -> log/sunshine-internal
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 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")) |