1 files changed, 24 insertions, 0 deletions

diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index a265906..1e16b92 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -547,6 +547,15 @@ void LLInventoryView::init(LLInventoryModel* inventory)
                 recent_items_panel->getFilter()->markDefault();
                 recent_items_panel->setSelectCallback(onSelectionChange, recent_items_panel);
         }
+        LLInventoryPanel* worn_items_panel = getChild<LLInventoryPanel>("Worn Items");
+        if (worn_items_panel)
+        {
+                worn_items_panel->setSortOrder(gSavedSettings.getU32("InventorySortOrder"));
+                worn_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
+                worn_items_panel->getFilter()->markDefault();
+                worn_items_panel->setFilterWorn(true);
+                worn_items_panel->setSelectCallback(onSelectionChange, worn_items_panel);
+        }
 
         // Now load the stored settings from disk, if available.
         std::ostringstream filterSaveName;
@@ -595,6 +604,7 @@ BOOL LLInventoryView::postBuild()
 {
         childSetTabChangeCallback("inventory filter tabs", "All Items", onFilterSelected, this);
         childSetTabChangeCallback("inventory filter tabs", "Recent Items", onFilterSelected, this);
+        childSetTabChangeCallback("inventory filter tabs", "Worn Items", onFilterSelected, this);
         //panel->getFilter()->markDefault();
         return TRUE;
 }
@@ -621,6 +631,15 @@ LLInventoryView::~LLInventoryView( void )
                 filter->toLLSD(filterState);
                 filterRoot[filter->getName()] = filterState;
         }
+        
+        LLInventoryPanel* worn_items_panel = getChild<LLInventoryPanel>("Worn Items");
+        if (worn_items_panel)
+        {
+                LLInventoryFilter* filter = worn_items_panel->getFilter();
+                LLSD filterState;
+                filter->toLLSD(filterState);
+                filterRoot[filter->getName()] = filterState;
+        }
 
         std::ostringstream filterSaveName;
         filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "filters.xml");
@@ -1653,6 +1672,11 @@ void LLInventoryPanel::setFilterSubString(const std::string& string)
         mFolders->getFilter()->setFilterSubString(string);
 }
 
+void LLInventoryPanel::setFilterWorn(bool worn)
+{
+        mFolders->getFilter()->setFilterWorn(worn);
+}
+
 void LLInventoryPanel::setSortOrder(U32 order)
 {
         mFolders->getFilter()->setSortOrder(order);