diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-04-25 11:06:37 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-04-25 11:06:37 +0800 |
commit | f7b2c0d7d95ca8609a948a7d11b44534d8ac5249 (patch) | |
tree | b9d80bc52d207acf50ea01b465ab26749ba40f72 /indra/newview/llinventoryfilter.cpp | |
parent | c82295910685c54acf597277e9dac0f70eb40239 (diff) | |
parent | fc71a9c1ed96cb1cb97124e3cceabdfa11e1cc75 (diff) |
Merge tag '7.1.6-release'
source for viewer 7.1.6.8745209917
Diffstat (limited to 'indra/newview/llinventoryfilter.cpp')
-rw-r--r-- | indra/newview/llinventoryfilter.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 9e68fe767a..9e3235592a 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -202,12 +202,18 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const && !LLInventoryModelBackgroundFetch::instance().inventoryFetchInProgress()) { LLViewerInventoryCategory* cat = gInventory.getCategory(folder_id); - if ((!cat && folder_id.notNull()) || (cat && cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)) + if ((!cat && folder_id.notNull())) { - // At the moment background fetch only cares about VERSION_UNKNOWN, - // so do not check isCategoryComplete that compares descendant count + // Shouldn't happen? Server provides full list of folders on startup LLInventoryModelBackgroundFetch::instance().start(folder_id, false); } + else if (cat && cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN) + { + // At the moment background fetch only cares about VERSION_UNKNOWN, + // so do not check isCategoryComplete that compares descendant count, + // but if that is nesesary, do a forced scheduleFolderFetch. + cat->fetch(); + } } if (!checkAgainstFilterThumbnails(folder_id)) |