diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-01-13 13:46:45 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-01-13 13:46:45 -0500 |
| commit | 6f3cf79a3afa66db229a1c1068e0c01f246f0b79 (patch) | |
| tree | 5eb6e710adc6a0c770f681fabb44fd385dbef977 /indra/newview/llpanelmaininventory.cpp | |
| parent | ccd10beb6f8523c401b08d57e916c85d756eb27e (diff) | |
| parent | fad02b30ce61a38007c5cd450cbdd2e09464888d (diff) | |
merge changes for 3.7.24-release
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rwxr-xr-x | indra/newview/llpanelmaininventory.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index a5063de0f4..37273a7793 100755 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -153,7 +153,9 @@ BOOL LLPanelMainInventory::postBuild() recent_items_panel->setSinceLogoff(TRUE); recent_items_panel->setSortOrder(LLInventoryFilter::SO_DATE); recent_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS); - recent_items_panel->getFilter().markDefault(); + LLInventoryFilter& recent_filter = recent_items_panel->getFilter(); + recent_filter.setFilterObjectTypes(recent_filter.getFilterObjectTypes() & ~(0x1 << LLInventoryType::IT_CATEGORY)); + recent_filter.markDefault(); recent_items_panel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, recent_items_panel, _1, _2)); } @@ -853,9 +855,9 @@ void LLFloaterInventoryFinder::draw() filtered_by_all_types = FALSE; } - if (!filtered_by_all_types) + if (!filtered_by_all_types || (mPanelMainInventory->getPanel()->getFilter().getFilterTypes() & LLInventoryFilter::FILTERTYPE_DATE)) { - // don't include folders in filter, unless I've selected everything + // don't include folders in filter, unless I've selected everything or filtering by date filter &= ~(0x1 << LLInventoryType::IT_CATEGORY); } |