From 45f5a027f64ca1e16059757353d9d206160ed66f Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 7 Mar 2012 15:37:52 -0800 Subject: EXP-1912 : Fix the substring filtering I broke while trying to fix 1912 the first time around. --- indra/newview/llfolderview.cpp | 9 ++------- 1 file 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()) -- cgit v1.2.3