Skip to content
Snippets Groups Projects
Commit c03e22e4 authored by andreykproductengine's avatar andreykproductengine
Browse files

MAINT-4325 FIXED [BEAR] Fix to "Reset Filters" causes empty folders to appear...

MAINT-4325 FIXED [BEAR] Fix to "Reset Filters" causes empty folders to appear in Recent tab of Inventory
parent 9074ea16
Branches
Tags
No related merge requests found
...@@ -151,7 +151,9 @@ BOOL LLPanelMainInventory::postBuild() ...@@ -151,7 +151,9 @@ BOOL LLPanelMainInventory::postBuild()
recent_items_panel->setSinceLogoff(TRUE); recent_items_panel->setSinceLogoff(TRUE);
recent_items_panel->setSortOrder(LLInventoryFilter::SO_DATE); recent_items_panel->setSortOrder(LLInventoryFilter::SO_DATE);
recent_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS); 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)); recent_items_panel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, recent_items_panel, _1, _2));
} }
...@@ -183,13 +185,6 @@ BOOL LLPanelMainInventory::postBuild() ...@@ -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"); mFilterEditor = getChild<LLFilterEditor>("inventory search editor");
if (mFilterEditor) if (mFilterEditor)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment