CHUI-272: BUGFIX Correcting the inventory filtering so that a large number of items in the inventory are completely processed before the filter's modified flag is cleared.

master
Todd Stinson 2012-08-08 18:17:01 -07:00
parent 02bdceb580
commit 2b026a8066
1 changed files with 7 additions and 1 deletions

View File

@ -1715,11 +1715,17 @@ void LLFolderView::update()
{
mNeedsAutoSelect = TRUE;
}
getFolderViewModel()->getFilter().clearModified();
// filter to determine visibility before arranging
filter(getFolderViewModel()->getFilter());
// Clear the modified setting on the filter only if the filter count is non-zero after running the filter process
// Note: if the filter count is zero, then the filter most likely halted before completing the entire set of items
if (getFolderViewModel()->getFilter().isModified() && (getFolderViewModel()->getFilter().getFilterCount() > 0))
{
getFolderViewModel()->getFilter().clearModified();
}
// automatically show matching items, and select first one if we had a selection
if (mNeedsAutoSelect)
{