diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-12-27 20:15:08 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-12-27 20:15:08 +0200 |
| commit | ca5c706f64f21c2a8a78d83a231e3827d147f7f4 (patch) | |
| tree | 7ff2cada65f0337beaa28d23eed05695b1c56321 /indra/newview | |
| parent | 7191d43bdb5bf527e7f1132b39c1800c773c633a (diff) | |
MAINT-4097 User never de-clouds with a large inventory after inventory fetch
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index e995c138b4..1433ea36bf 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -40,6 +40,7 @@ #include "llinventorybridge.h" #include "llviewerfoldertype.h" #include "llradiogroup.h" +#include "llstartup.h" // linden library includes #include "llclipboard.h" @@ -132,8 +133,10 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const } // when applying a filter, matching folders get their contents downloaded first + // but make sure we are not interfering with pre-download if (isNotDefault() - && !gInventory.isCategoryComplete(folder_id)) + && !gInventory.isCategoryComplete(folder_id) + && LLStartUp::getStartupState() > STATE_WEARABLES_WAIT) { LLInventoryModelBackgroundFetch::instance().start(folder_id); } @@ -307,7 +310,11 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLFolderViewModelItemInvent if (is_hidden_if_empty) { // Force the fetching of those folders so they are hidden if they really are empty... - gInventory.fetchDescendentsOf(object_id); + // But don't interfere with startup download + if (LLStartUp::getStartupState() > STATE_WEARABLES_WAIT) + { + gInventory.fetchDescendentsOf(object_id); + } LLInventoryModel::cat_array_t* cat_array = NULL; LLInventoryModel::item_array_t* item_array = NULL; |