diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-08-06 17:50:40 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-08-06 17:50:40 +0300 |
| commit | c03e22e420a17e47b597c90978eb2f4d206f2ffe (patch) | |
| tree | 18dbc235176bb1b89ef81e5fff810f2872dfd99f | |
| parent | 9074ea166389941365447acffb9ca03ce2d9248c (diff) | |
MAINT-4325 FIXED [BEAR] Fix to "Reset Filters" causes empty folders to appear in Recent tab of Inventory
| -rwxr-xr-x | indra/newview/llpanelmaininventory.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 2378e09979..ddf1a63c6e 100755 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -151,7 +151,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)); } @@ -183,13 +185,6 @@ BOOL LLPanelMainInventory::postBuild() } - if (recent_items_panel) - { - U64 types = recent_items_panel->getFilter().getFilterObjectTypes(); - types &= ~(0x1 << LLInventoryType::IT_CATEGORY); - recent_items_panel->getFilter().setFilterObjectTypes(types); - } - mFilterEditor = getChild<LLFilterEditor>("inventory search editor"); if (mFilterEditor) { |