Skip to content
Snippets Groups Projects
Commit 8ed869a2 authored by AndreyL ProductEngine's avatar AndreyL ProductEngine
Browse files

MAINT-7625 Fixed wrong warning when deleting an empty folder

parent 5bcdbd97
No related branches found
No related tags found
No related merge requests found
...@@ -258,6 +258,15 @@ bool LLFolderViewModelItemInventory::filter( LLFolderViewFilter& filter) ...@@ -258,6 +258,15 @@ bool LLFolderViewModelItemInventory::filter( LLFolderViewFilter& filter)
{ {
// This is where filter check on the item done (CHUI-849) // This is where filter check on the item done (CHUI-849)
const bool passed_filter = filter.check(this); const bool passed_filter = filter.check(this);
if (passed_filter && mChildren.empty()) // Update the latest filter generation for empty folders
{
LLFolderViewModelItemInventory* view_model = this;
while (view_model && view_model->mMostFilteredDescendantGeneration < filter_generation)
{
view_model->mMostFilteredDescendantGeneration = filter_generation;
view_model = static_cast<LLFolderViewModelItemInventory*>(view_model->mParent);
}
}
setPassedFilter(passed_filter, filter_generation, filter.getStringMatchOffset(this), filter.getFilterStringSize()); setPassedFilter(passed_filter, filter_generation, filter.getStringMatchOffset(this), filter.getFilterStringSize());
continue_filtering = !filter.isTimedOut(); continue_filtering = !filter.isTimedOut();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment