diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-07-14 12:28:29 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-07-14 12:28:29 +0300 |
| commit | 30c73d0f25bd7738c769fdba1ed947e1bfeb6ced (patch) | |
| tree | 8d0ebb92beab9e72e94e71dff3d46f05f1a6e28a /indra/newview | |
| parent | 8f429fac242679cbbac8b6c33be0c593baac41c2 (diff) | |
MAINT-4218 FIXED Adding clothing from inventory closes THAT clothing folder and hides THAT folder
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfolderviewmodelinventory.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp index 7339398fa5..11d49ff784 100755 --- a/indra/newview/llfolderviewmodelinventory.cpp +++ b/indra/newview/llfolderviewmodelinventory.cpp @@ -129,13 +129,15 @@ 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) + if (before != mPrevPassedAllFilters || (init_state && before && !mFolderViewItem->getVisible())) { - // 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 + // or folder was hidden during update as filter-dirty (MAINT-4218) LLFolderViewFolder* parent_folder = mFolderViewItem->getParentFolder(); if (parent_folder) { |