diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-08-08 18:17:01 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-08 18:17:01 -0700 |
| commit | 2b026a806617532a0b2c8a796e9530273c110cf4 (patch) | |
| tree | be890a4fd58e08296c1428b34367fdff1b029074 /indra | |
| parent | 02bdceb5808b670fdb16784f11488c12c09e1b4b (diff) | |
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.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index fedb8bc014..1a8ab63388 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -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) { |