diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-07-29 17:55:06 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-07-29 17:55:06 +0300 |
| commit | 0ea34fba7347987d95926ef5ef20019a6e3bcf86 (patch) | |
| tree | 86aabca51ac8d9d7d735306c4a972de40a32ddb6 /indra/newview/llfolderviewmodelinventory.cpp | |
| parent | 32e6df586db4d9f64c3e57bab42e9d8e99a38299 (diff) | |
MAINT-4289 FIXED [BEAR] Recent Items "Reset Filters" not working correctly
reverted and remade MAINT-4218
Diffstat (limited to 'indra/newview/llfolderviewmodelinventory.cpp')
| -rwxr-xr-x | indra/newview/llfolderviewmodelinventory.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp index 11d49ff784..7615c12043 100755 --- a/indra/newview/llfolderviewmodelinventory.cpp +++ b/indra/newview/llfolderviewmodelinventory.cpp @@ -129,15 +129,13 @@ void LLFolderViewModelItemInventory::requestSort() void LLFolderViewModelItemInventory::setPassedFilter(bool passed, S32 filter_generation, std::string::size_type string_offset, std::string::size_type string_size) { - bool init_state = getLastFilterGeneration() < 0; LLFolderViewModelItemCommon::setPassedFilter(passed, filter_generation, string_offset, string_size); bool before = mPrevPassedAllFilters; mPrevPassedAllFilters = passedFilter(filter_generation); - if (before != mPrevPassedAllFilters || (init_state && before && !mFolderViewItem->getVisible())) + if (before != mPrevPassedAllFilters) { // Need to rearrange the folder if the filtered state of the item changed - // or folder was hidden during update as filter-dirty (MAINT-4218) LLFolderViewFolder* parent_folder = mFolderViewItem->getParentFolder(); if (parent_folder) { |