diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-03-05 17:32:20 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-03-05 17:32:20 -0800 |
| commit | a56290f408cbae4c947a0e2f6ec1ad0e6baff60a (patch) | |
| tree | 786aa348c3cdc746f2ee0e581c3f85c64542a4d1 /indra/newview/llfolderview.cpp | |
| parent | 652c67c2bcf077e580d734f68f5d9c374ed91b5d (diff) | |
EXP-1912 : Fix filtering of folders when those are being cut.
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index d9c6f4d9ce..ec954ac881 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -429,8 +429,13 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_gen } else { - folderp->setVisible(show_folder_state == LLInventoryFilter::SHOW_ALL_FOLDERS || // always show folders? - (folderp->getFiltered(filter_generation) || folderp->hasFilteredDescendants(filter_generation))); // passed filter or has descendants that passed filter + bool visible = (show_folder_state == LLInventoryFilter::SHOW_ALL_FOLDERS || // always show folders? + (folderp->getFiltered(filter_generation) || folderp->hasFilteredDescendants(filter_generation))); + if (getFilter()) + { + visible &= getFilter()->check(folderp); + } + folderp->setVisible(visible); } if (folderp->getVisible()) |