diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 20:22:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 20:22:45 +0300 |
| commit | 4c54488470a37f53f46c9d4694644a10b92b9790 (patch) | |
| tree | 494487bbc57c79d17921b7443003d2a118e24ddb /indra/newview/llinventoryfilter.cpp | |
| parent | 398369233fc2621eb447701e26082057fb0c97d7 (diff) | |
| parent | 85f2447b3ddf7e4b91cd5963cb2e7668d48ab2a9 (diff) | |
Merge pull request #1316 from secondlife/marchcat/a-merge
Release (Maint YZ) -> Maint A merge
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 e1cbd291b9..83770e28b6 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)) |