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/llinventoryfilter.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/llinventoryfilter.cpp')
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 49e0ab33e5..d6278a5fda 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -125,7 +125,8 @@ bool LLInventoryFilter::checkFolder(const LLFolderViewFolder* folder) const LLViewerInventoryCategory *cat = gInventory.getCategory(folder_id); if (!cat) return false; - if ((1LL << cat->getPreferredType() & mFilterOps.mFilterCategoryTypes) == U64(0)) + LLFolderType::EType cat_type = cat->getPreferredType(); + if (cat_type != LLFolderType::FT_NONE && (1LL << cat_type & mFilterOps.mFilterCategoryTypes) == U64(0)) return false; } @@ -298,8 +299,8 @@ void LLInventoryFilter::updateFilterTypes(U64 types, U64& current_types) if (current_types != types) { // keep current items only if no type bits getting turned off - BOOL fewer_bits_set = (current_types & ~types); - BOOL more_bits_set = (~current_types & types); + bool fewer_bits_set = (current_types & ~types) != 0; + bool more_bits_set = (~current_types & types) != 0; current_types = types; if (more_bits_set && fewer_bits_set) |