diff options
| author | Richard Linden <none@none> | 2011-06-28 14:45:09 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-28 14:45:09 -0700 |
| commit | c998f21c5201a4c117ad601fbd23c116fd9faa04 (patch) | |
| tree | f3b8c673a3d1ff0bd1d1bb57fcf808e4865933e9 /indra/newview/llfolderviewitem.cpp | |
| parent | 200073c97a34a90718c3362efaed98c52fa12a17 (diff) | |
EXP-922 FIX Purchased Direct Delivery items do not appear in Recent Inventory tab
switched to using filters to hide inbox and show it for recent items only
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
| -rw-r--r-- | indra/newview/llfolderviewitem.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index f5e1aa005b..d3b204200a 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -1203,10 +1203,10 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation) } else { - bool is_hidden = folderp->getListener() && LLViewerFolderType::lookupIsHiddenType(folderp->getListener()->getPreferredType()); - - folderp->setVisible( !is_hidden - && (folderp->getFiltered(filter_generation) || folderp->hasFilteredDescendants(filter_generation))); // passed filter or has descendants that passed filter + folderp->setVisible( folderp->getListener() + && ((folderp->getFilteredFolder(filter_generation) + && folderp->getFiltered(filter_generation)) + || folderp->hasFilteredDescendants(filter_generation))); // passed filter or has descendants that passed filter } if (folderp->getVisible()) |