diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-03-07 15:37:52 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-03-07 15:37:52 -0800 |
| commit | 45f5a027f64ca1e16059757353d9d206160ed66f (patch) | |
| tree | 608206a76ea6d539281485501e56f6f9546545e9 /indra/newview/llfolderview.cpp | |
| parent | 85d380b210ebb609f6fc273918e06007c9da1950 (diff) | |
EXP-1912 : Fix the substring filtering I broke while trying to fix 1912 the first time around.
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 99a3d65c6f..3103267b35 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -429,13 +429,8 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_gen } else { - 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); + folderp->setVisible((show_folder_state == LLInventoryFilter::SHOW_ALL_FOLDERS || // always show folders? + (folderp->getFiltered(filter_generation) || folderp->hasFilteredDescendants(filter_generation)))); } if (folderp->getVisible()) |