From 929c52324d78cd2cb9905f280581d29b5feab809 Mon Sep 17 00:00:00 2001 From: Arrehn Date: Mon, 6 Jun 2011 02:18:28 -0400 Subject: [PATCH] FIRE-234, Gestures no longer shown in worn tab by default --- indra/newview/llpanelmaininventory.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 3e53517a2b..8938448217 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -165,7 +165,8 @@ BOOL LLPanelMainInventory::postBuild() worn_items_panel->setWorn(TRUE); worn_items_panel->setSortOrder(gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER)); worn_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS); - worn_items_panel->getFilter()->markDefault(); + //worn_items_panel->getFilter()->markDefault(); + worn_items_panel->getFilter()->setFilterObjectTypes(0xffffffff - (0x1 << LLInventoryType::IT_GESTURE)); worn_items_panel->openAllFolders(); worn_items_panel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, worn_items_panel, _1, _2)); } @@ -194,15 +195,15 @@ BOOL LLPanelMainInventory::postBuild() } } - if(worn_items_panel) - { - if(savedFilterState.has(worn_items_panel->getFilter()->getName())) - { - LLSD worn_items = savedFilterState.get( - worn_items_panel->getFilter()->getName()); - worn_items_panel->getFilter()->fromLLSD(worn_items); - } - } + if(worn_items_panel) + { + if(savedFilterState.has(worn_items_panel->getFilter()->getName())) + { + LLSD worn_items = savedFilterState.get( + worn_items_panel->getFilter()->getName()); + worn_items_panel->getFilter()->fromLLSD(worn_items); + } + } } mFilterEditor = getChild("inventory search editor");