diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-08-21 20:59:48 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-08-21 20:59:48 +0300 |
| commit | 23e2dcce9d2f4290e1f192d4fbcdc26ff4d4c8c3 (patch) | |
| tree | 77d618b892c96a164459a42b80ef1ce81461d885 /indra/newview | |
| parent | c0457d18fde5ad6c12a470ba607c2c80d94e7cc3 (diff) | |
fixing merge conflicts
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfolderviewmodelinventory.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp index 7bac47a317..3271a40ea0 100755 --- a/indra/newview/llfolderviewmodelinventory.cpp +++ b/indra/newview/llfolderviewmodelinventory.cpp @@ -129,13 +129,18 @@ void LLFolderViewModelItemInventory::requestSort() void LLFolderViewModelItemInventory::setPassedFilter(bool passed, S32 filter_generation, std::string::size_type string_offset, std::string::size_type string_size) { + bool generation_skip = mMarkedDirtyGeneration >= 0 + && mPrevPassedAllFilters + && mMarkedDirtyGeneration < mRootViewModel.getFilter().getFirstSuccessGeneration(); LLFolderViewModelItemCommon::setPassedFilter(passed, filter_generation, string_offset, string_size); bool before = mPrevPassedAllFilters; mPrevPassedAllFilters = passedFilter(filter_generation); - if (before != mPrevPassedAllFilters) + if (before != mPrevPassedAllFilters || generation_skip) { - // Need to rearrange the folder if the filtered state of the item changed + // Need to rearrange the folder if the filtered state of the item changed, + // previously passed item skipped filter generation changes while being dirty + // or previously passed not yet filtered item was marked dirty LLFolderViewFolder* parent_folder = mFolderViewItem->getParentFolder(); if (parent_folder) { |