#5046 Optimize outfit's onRefreshComplete #3

akleshchev · akleshchev · commit 6686fc2a5236 · 2025-11-27T16:58:32.000+02:00
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
@@ -54,7 +54,7 @@
 #include "llvoavatarself.h"
 #include "llwearableitemslist.h"
 
-static bool is_tab_header_clicked(LLAccordionCtrlTab* tab, S32 y);
+static bool is_tab_header_clicked(LLOutfitAccordionCtrlTab* tab, S32 y);
 
 static const LLOutfitTabNameComparator OUTFIT_TAB_NAME_COMPARATOR;
 static const LLOutfitTabFavComparator OUTFIT_TAB_FAV_COMPARATOR;
@@ -246,7 +246,10 @@ void LLOutfitsList::updateAddedCategory(LLUUID cat_id)
     list->setCommitCallback(boost::bind(&LLOutfitsList::onListSelectionChange, this, _1));
 
     // Setting list refresh callback to apply filter on list change.
-    list->setRefreshCompleteCallback(boost::bind(&LLOutfitsList::onRefreshComplete, this, _1));
+    list->setRefreshCompleteCallback([this, tab](LLUICtrl* ctrl, const LLSD& sd)
+    {
+        onRefreshComplete(ctrl, tab);
+    });
 
     list->setRightMouseDownCallback(boost::bind(&LLOutfitsList::onWearableItemsListRightClick, this, _1, _2, _3));
 
@@ -294,7 +297,7 @@ void LLOutfitsList::updateRemovedCategory(LLUUID cat_id)
     if (outfits_iter != mOutfitsMap.end())
     {
         const LLUUID& outfit_id = outfits_iter->first;
-        LLAccordionCtrlTab* tab = outfits_iter->second;
+        LLOutfitAccordionCtrlTab* tab = outfits_iter->second;
 
         // An outfit is removed from the list. Do the following:
         // 1. Remove outfit category from observer to stop monitoring its changes.
@@ -322,11 +325,11 @@ void LLOutfitsList::onHighlightBaseOutfit(LLUUID base_id, LLUUID prev_id)
 {
     if (mOutfitsMap[prev_id])
     {
-        ((LLOutfitAccordionCtrlTab*)mOutfitsMap[prev_id])->setOutfitSelected(false);
+        mOutfitsMap[prev_id]->setOutfitSelected(false);
     }
     if (mOutfitsMap[base_id])
     {
-        ((LLOutfitAccordionCtrlTab*)mOutfitsMap[base_id])->setOutfitSelected(true);
+        mOutfitsMap[base_id]->setOutfitSelected(true);
     }
 }
 
@@ -370,7 +373,7 @@ void LLOutfitsList::onSetSelectedOutfitByUUID(const LLUUID& outfit_uuid)
     {
         if (outfit_uuid == iter->first)
         {
-            LLAccordionCtrlTab* tab = iter->second;
+            LLOutfitAccordionCtrlTab* tab = iter->second;
             if (!tab) continue;
 
             LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
@@ -464,7 +467,7 @@ void LLOutfitsList::onCollapseAllFolders()
             iter != mOutfitsMap.end();
             ++iter)
     {
-        LLAccordionCtrlTab* tab = iter->second;
+        LLOutfitAccordionCtrlTab* tab = iter->second;
         if(tab && tab->isExpanded())
         {
             tab->changeOpenClose(true);
@@ -478,7 +481,7 @@ void LLOutfitsList::onExpandAllFolders()
             iter != mOutfitsMap.end();
             ++iter)
     {
-        LLAccordionCtrlTab* tab = iter->second;
+        LLOutfitAccordionCtrlTab* tab = iter->second;
         if(tab && !tab->isExpanded())
         {
             tab->changeOpenClose(false);
@@ -501,7 +504,7 @@ void LLOutfitsList::updateChangedCategoryName(LLViewerInventoryCategory *cat, st
     if (outfits_iter != mOutfitsMap.end())
     {
         // Update tab name with the new category name.
-        LLOutfitAccordionCtrlTab* tab = (LLOutfitAccordionCtrlTab*) outfits_iter->second;
+        LLOutfitAccordionCtrlTab* tab = outfits_iter->second;
         if (tab)
         {
             tab->setName(name);
@@ -554,7 +557,7 @@ void LLOutfitsList::deselectOutfit(const LLUUID& category_id)
     LLOutfitListBase::deselectOutfit(category_id);
 }
 
-void LLOutfitsList::restoreOutfitSelection(LLAccordionCtrlTab* tab, const LLUUID& category_id)
+void LLOutfitsList::restoreOutfitSelection(LLOutfitAccordionCtrlTab* tab, const LLUUID& category_id)
 {
     // Try restoring outfit selection after filtering.
     if (mAccordion->getSelectedTab() == tab)
@@ -563,27 +566,21 @@ void LLOutfitsList::restoreOutfitSelection(LLAccordionCtrlTab* tab, const LLUUID
     }
 }
 
-void LLOutfitsList::onRefreshComplete(LLUICtrl* ctrl)
+void LLOutfitsList::onRefreshComplete(LLUICtrl* ctrl, LLOutfitAccordionCtrlTab* tab)
 {
     if (!ctrl || getFilterSubString().empty())
         return;
 
-    LL_PROFILE_ZONE_SCOPED;
-
-    // TODO: We are doing it multiple times per frame on init
-    // as multiple lists are refreshing. Needs improvements.
-    for (outfits_map_t::iterator
-             iter = mOutfitsMap.begin(),
-             iter_end = mOutfitsMap.end();
-         iter != iter_end; ++iter)
+    LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
+    if (list != ctrl)
     {
-        LLAccordionCtrlTab* tab = iter->second;
-        if (!tab) continue;
-
-        LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
-        if (list != ctrl) continue;
-
-        applyFilterToTab(iter->first, tab, getFilterSubString());
+        llassert(false);
+        LL_WARNS() << "LLOutfitsList::onRefreshComplete: ctrl does not match tab's list!" << LL_ENDL;
+        return;
+    }
+    if (tab->getFilterGeneration() != getFilterGeneration())
+    {
+        applyFilterToTab(tab->getFolderID(), tab, getFilterSubString());
     }
 }
 
@@ -596,7 +593,7 @@ void LLOutfitsList::onFilterSubStringChanged(const std::string& new_string, cons
     while (iter != iter_end)
     {
         const LLUUID& category_id = iter->first;
-        LLAccordionCtrlTab* tab = iter++->second;
+        LLOutfitAccordionCtrlTab* tab = iter++->second;
         if (!tab) continue;
 
         LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
@@ -635,9 +632,10 @@ void LLOutfitsList::onFilterSubStringChanged(const std::string& new_string, cons
 
 void LLOutfitsList::applyFilterToTab(
     const LLUUID&       category_id,
-    LLAccordionCtrlTab* tab,
+    LLOutfitAccordionCtrlTab* tab,
     const std::string&  filter_substring)
 {
+    LL_PROFILE_ZONE_SCOPED;
     if (!tab) return;
     LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
     if (!list) return;
@@ -649,6 +647,7 @@ void LLOutfitsList::applyFilterToTab(
     LLStringUtil::toUpper(cur_filter);
 
     tab->setTitle(tab->getTitle(), cur_filter);
+    tab->setFilterGeneration(getFilterGeneration());
 
     if (std::string::npos == title.find(cur_filter))
     {
@@ -772,7 +771,7 @@ void LLOutfitsList::onCOFChanged()
     outfits_map_t::iterator map_iter = mOutfitsMap.begin(), map_end = mOutfitsMap.end();
     while (map_iter != map_end)
     {
-        LLAccordionCtrlTab* tab = (map_iter++)->second;
+        LLOutfitAccordionCtrlTab* tab = (map_iter++)->second;
         if (!tab) continue;
 
         LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
@@ -803,7 +802,7 @@ void LLOutfitsList::sortOutfits()
 
 void LLOutfitsList::onOutfitRightClick(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& cat_id)
 {
-    LLAccordionCtrlTab* tab = dynamic_cast<LLAccordionCtrlTab*>(ctrl);
+    LLOutfitAccordionCtrlTab* tab = dynamic_cast<LLOutfitAccordionCtrlTab*>(ctrl);
     if (mOutfitMenu && is_tab_header_clicked(tab, y) && cat_id.notNull())
     {
         // Focus tab header to trigger tab selection change.
@@ -826,7 +825,7 @@ void LLOutfitsList::handleInvFavColorChange()
         ++iter)
     {
         if (!iter->second) continue;
-        LLOutfitAccordionCtrlTab* tab = (LLOutfitAccordionCtrlTab*)iter->second;
+        LLOutfitAccordionCtrlTab* tab = iter->second;
 
         // refresh font color
         tab->setFavorite(tab->getFavorite());
@@ -853,7 +852,7 @@ void LLOutfitsList::onChangeSortOrder(const LLSD& userdata)
         {
             for (outfits_map_t::value_type& outfit : mOutfitsMap)
             {
-                LLAccordionCtrlTab* tab = outfit.second;
+                LLOutfitAccordionCtrlTab* tab = outfit.second;
                 const LLUUID& category_id = outfit.first;
                 if (!tab) continue;
 
@@ -894,7 +893,7 @@ LLOutfitListGearMenuBase* LLOutfitsList::createGearMenu()
 }
 
 
-bool is_tab_header_clicked(LLAccordionCtrlTab* tab, S32 y)
+bool is_tab_header_clicked(LLOutfitAccordionCtrlTab* tab, S32 y)
 {
     if(!tab || !tab->getHeaderVisible()) return false;
 
diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h
@@ -38,14 +38,13 @@
 #include "lltoggleablemenu.h"
 #include "llviewermenu.h"
 
-class LLAccordionCtrlTab;
+class LLOutfitAccordionCtrlTab;
 class LLInventoryCategoriesObserver;
 class LLOutfitListGearMenuBase;
 class LLOutfitListSortMenuBase;
 class LLWearableItemsList;
 class LLListContextMenu;
 
-
 /**
  * @class LLOutfitTabNameComparator
  *
@@ -266,7 +265,10 @@ class LLOutfitAccordionCtrlTab : public LLAccordionCtrlTab
 
     void setFavorite(bool is_favorite);
     bool getFavorite() const { return mIsFavorite; }
+    LLUUID getFolderID() const { return mFolderID; }
     void setOutfitSelected(bool val);
+    U32 getFilterGeneration() const { return mFilterGeneration; }
+    void setFilterGeneration(U32 generation) { mFilterGeneration = generation; }
 
     static LLUIImage* sFavoriteIcon;
     static LLUIColor sFgColor;
@@ -284,6 +286,7 @@ class LLOutfitAccordionCtrlTab : public LLAccordionCtrlTab
     LLUUID mFolderID;
     bool mIsFavorite = false;
     bool mIsSelected = false;
+    U32 mFilterGeneration = 0;
 };
   /**
  * @class LLOutfitsList
@@ -386,20 +389,20 @@ class LLOutfitsList : public LLOutfitListBase
      *
      * A tab may be hidden if it doesn't match current filter.
      */
-    void restoreOutfitSelection(LLAccordionCtrlTab* tab, const LLUUID& category_id);
+    void restoreOutfitSelection(LLOutfitAccordionCtrlTab* tab, const LLUUID& category_id);
 
     /**
      * Called upon list refresh event to update tab visibility depending on
      * the results of applying filter to the title and list items of the tab.
      */
-    void onRefreshComplete(LLUICtrl* ctrl);
+    void onRefreshComplete(LLUICtrl* ctrl, LLOutfitAccordionCtrlTab* tab);
 
     /**
      * Applies filter to the given tab
      *
      * @see applyFilter()
      */
-    void applyFilterToTab(const LLUUID& category_id, LLAccordionCtrlTab* tab, const std::string& filter_substring);
+    void applyFilterToTab(const LLUUID& category_id, LLOutfitAccordionCtrlTab* tab, const std::string& filter_substring);
 
     /**
      * Returns true if all selected items can be worn.
@@ -426,7 +429,7 @@ class LLOutfitsList : public LLOutfitListBase
     typedef wearables_lists_map_t::value_type           wearables_lists_map_value_t;
     wearables_lists_map_t           mSelectedListsMap;
 
-    typedef std::map<LLUUID, LLAccordionCtrlTab*>       outfits_map_t;
+    typedef std::map<LLUUID, LLOutfitAccordionCtrlTab*>       outfits_map_t;
     typedef outfits_map_t::value_type                   outfits_map_value_t;
     outfits_map_t                   mOutfitsMap;
 
diff --git a/indra/newview/llpanelappearancetab.cpp b/indra/newview/llpanelappearancetab.cpp
@@ -40,6 +40,7 @@ void LLPanelAppearanceTab::setFilterSubString(const std::string& new_string)
     {
         std::string old_string = mFilterSubString;
         mFilterSubString = new_string;
+        mFilterGeneration++;
         onFilterSubStringChanged(mFilterSubString, old_string);
     }
 
@@ -52,6 +53,7 @@ void LLPanelAppearanceTab::checkFilterSubString()
     {
         std::string old_string = mFilterSubString;
         mFilterSubString = sRecentFilterSubString;
+        mFilterGeneration++;
         onFilterSubStringChanged(mFilterSubString, old_string);
     }
 }
diff --git a/indra/newview/llpanelappearancetab.h b/indra/newview/llpanelappearancetab.h
@@ -48,6 +48,7 @@ class LLPanelAppearanceTab : public LLPanel
     virtual void getSelectedItemsUUIDs(uuid_vec_t& selected_uuids) const {}
 
     const std::string& getFilterSubString() { return mFilterSubString; }
+    U32 getFilterGeneration() { return mFilterGeneration; }
 
     virtual void updateMenuItemsVisibility() = 0;
     virtual LLToggleableMenu* getGearMenu() = 0;
@@ -63,6 +64,7 @@ class LLPanelAppearanceTab : public LLPanel
 
 private:
     std::string mFilterSubString;
+    U32         mFilterGeneration = 0;
 
     static std::string sRecentFilterSubString;
 };

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`#include "llvoavatarself.h"`
`55`	`55`	`#include "llwearableitemslist.h"`
`56`	`56`
`57`		`-static bool is_tab_header_clicked(LLAccordionCtrlTab* tab, S32 y);`
	`57`	`+static bool is_tab_header_clicked(LLOutfitAccordionCtrlTab* tab, S32 y);`
`58`	`58`
`59`	`59`	`static const LLOutfitTabNameComparator OUTFIT_TAB_NAME_COMPARATOR;`
`60`	`60`	`static const LLOutfitTabFavComparator OUTFIT_TAB_FAV_COMPARATOR;`
`@@ -246,7 +246,10 @@ void LLOutfitsList::updateAddedCategory(LLUUID cat_id)`
`246`	`246`	`list->setCommitCallback(boost::bind(&LLOutfitsList::onListSelectionChange, this, _1));`
`247`	`247`
`248`	`248`	`// Setting list refresh callback to apply filter on list change.`
`249`		`- list->setRefreshCompleteCallback(boost::bind(&LLOutfitsList::onRefreshComplete, this, _1));`
	`249`	`+ list->setRefreshCompleteCallback([this, tab](LLUICtrl* ctrl, const LLSD& sd)`
	`250`	`+ {`
	`251`	`+ onRefreshComplete(ctrl, tab);`
	`252`	`+ });`
`250`	`253`
`251`	`254`	`list->setRightMouseDownCallback(boost::bind(&LLOutfitsList::onWearableItemsListRightClick, this, _1, _2, _3));`
`252`	`255`
`@@ -294,7 +297,7 @@ void LLOutfitsList::updateRemovedCategory(LLUUID cat_id)`
`294`	`297`	`if (outfits_iter != mOutfitsMap.end())`
`295`	`298`	`{`
`296`	`299`	`const LLUUID& outfit_id = outfits_iter->first;`
`297`		`- LLAccordionCtrlTab* tab = outfits_iter->second;`
	`300`	`+ LLOutfitAccordionCtrlTab* tab = outfits_iter->second;`
`298`	`301`
`299`	`302`	`// An outfit is removed from the list. Do the following:`
`300`	`303`	`// 1. Remove outfit category from observer to stop monitoring its changes.`
`@@ -322,11 +325,11 @@ void LLOutfitsList::onHighlightBaseOutfit(LLUUID base_id, LLUUID prev_id)`
`322`	`325`	`{`
`323`	`326`	`if (mOutfitsMap[prev_id])`
`324`	`327`	`{`
`325`		`- ((LLOutfitAccordionCtrlTab*)mOutfitsMap[prev_id])->setOutfitSelected(false);`
	`328`	`+ mOutfitsMap[prev_id]->setOutfitSelected(false);`
`326`	`329`	`}`
`327`	`330`	`if (mOutfitsMap[base_id])`
`328`	`331`	`{`
`329`		`- ((LLOutfitAccordionCtrlTab*)mOutfitsMap[base_id])->setOutfitSelected(true);`
	`332`	`+ mOutfitsMap[base_id]->setOutfitSelected(true);`
`330`	`333`	`}`
`331`	`334`	`}`
`332`	`335`
`@@ -370,7 +373,7 @@ void LLOutfitsList::onSetSelectedOutfitByUUID(const LLUUID& outfit_uuid)`
`370`	`373`	`{`
`371`	`374`	`if (outfit_uuid == iter->first)`
`372`	`375`	`{`
`373`		`- LLAccordionCtrlTab* tab = iter->second;`
	`376`	`+ LLOutfitAccordionCtrlTab* tab = iter->second;`
`374`	`377`	`if (!tab) continue;`
`375`	`378`
`376`	`379`	`LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());`
`@@ -464,7 +467,7 @@ void LLOutfitsList::onCollapseAllFolders()`
`464`	`467`	`iter != mOutfitsMap.end();`
`465`	`468`	`++iter)`
`466`	`469`	`{`
`467`		`- LLAccordionCtrlTab* tab = iter->second;`
	`470`	`+ LLOutfitAccordionCtrlTab* tab = iter->second;`
`468`	`471`	`if(tab && tab->isExpanded())`
`469`	`472`	`{`
`470`	`473`	`tab->changeOpenClose(true);`
`@@ -478,7 +481,7 @@ void LLOutfitsList::onExpandAllFolders()`
`478`	`481`	`iter != mOutfitsMap.end();`
`479`	`482`	`++iter)`
`480`	`483`	`{`
`481`		`- LLAccordionCtrlTab* tab = iter->second;`
	`484`	`+ LLOutfitAccordionCtrlTab* tab = iter->second;`
`482`	`485`	`if(tab && !tab->isExpanded())`
`483`	`486`	`{`
`484`	`487`	`tab->changeOpenClose(false);`
`@@ -501,7 +504,7 @@ void LLOutfitsList::updateChangedCategoryName(LLViewerInventoryCategory *cat, st`
`501`	`504`	`if (outfits_iter != mOutfitsMap.end())`
`502`	`505`	`{`
`503`	`506`	`// Update tab name with the new category name.`
`504`		`- LLOutfitAccordionCtrlTab* tab = (LLOutfitAccordionCtrlTab*) outfits_iter->second;`
	`507`	`+ LLOutfitAccordionCtrlTab* tab = outfits_iter->second;`
`505`	`508`	`if (tab)`
`506`	`509`	`{`
`507`	`510`	`tab->setName(name);`
`@@ -554,7 +557,7 @@ void LLOutfitsList::deselectOutfit(const LLUUID& category_id)`
`554`	`557`	`LLOutfitListBase::deselectOutfit(category_id);`
`555`	`558`	`}`
`556`	`559`
`557`		`-void LLOutfitsList::restoreOutfitSelection(LLAccordionCtrlTab* tab, const LLUUID& category_id)`
	`560`	`+void LLOutfitsList::restoreOutfitSelection(LLOutfitAccordionCtrlTab* tab, const LLUUID& category_id)`
`558`	`561`	`{`
`559`	`562`	`// Try restoring outfit selection after filtering.`
`560`	`563`	`if (mAccordion->getSelectedTab() == tab)`
`@@ -563,27 +566,21 @@ void LLOutfitsList::restoreOutfitSelection(LLAccordionCtrlTab* tab, const LLUUID`
`563`	`566`	`}`
`564`	`567`	`}`
`565`	`568`
`566`		`-void LLOutfitsList::onRefreshComplete(LLUICtrl* ctrl)`
	`569`	`+void LLOutfitsList::onRefreshComplete(LLUICtrl* ctrl, LLOutfitAccordionCtrlTab* tab)`
`567`	`570`	`{`
`568`	`571`	`if (!ctrl \|\| getFilterSubString().empty())`
`569`	`572`	`return;`
`570`	`573`
`571`		`- LL_PROFILE_ZONE_SCOPED;`
`572`		`-`
`573`		`- // TODO: We are doing it multiple times per frame on init`
`574`		`- // as multiple lists are refreshing. Needs improvements.`
`575`		`- for (outfits_map_t::iterator`
`576`		`- iter = mOutfitsMap.begin(),`
`577`		`- iter_end = mOutfitsMap.end();`
`578`		`- iter != iter_end; ++iter)`
	`574`	`+ LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());`
	`575`	`+ if (list != ctrl)`
`579`	`576`	`{`
`580`		`- LLAccordionCtrlTab* tab = iter->second;`
`581`		`- if (!tab) continue;`
`582`		`-`
`583`		`- LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());`
`584`		`- if (list != ctrl) continue;`
`585`		`-`
`586`		`- applyFilterToTab(iter->first, tab, getFilterSubString());`
	`577`	`+ llassert(false);`
	`578`	`+ LL_WARNS() << "LLOutfitsList::onRefreshComplete: ctrl does not match tab's list!" << LL_ENDL;`
	`579`	`+ return;`
	`580`	`+ }`
	`581`	`+ if (tab->getFilterGeneration() != getFilterGeneration())`
	`582`	`+ {`
	`583`	`+ applyFilterToTab(tab->getFolderID(), tab, getFilterSubString());`
`587`	`584`	`}`
`588`	`585`	`}`
`589`	`586`
`@@ -596,7 +593,7 @@ void LLOutfitsList::onFilterSubStringChanged(const std::string& new_string, cons`
`596`	`593`	`while (iter != iter_end)`
`597`	`594`	`{`
`598`	`595`	`const LLUUID& category_id = iter->first;`
`599`		`- LLAccordionCtrlTab* tab = iter++->second;`
	`596`	`+ LLOutfitAccordionCtrlTab* tab = iter++->second;`
`600`	`597`	`if (!tab) continue;`
`601`	`598`
`602`	`599`	`LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());`
`@@ -635,9 +632,10 @@ void LLOutfitsList::onFilterSubStringChanged(const std::string& new_string, cons`
`635`	`632`
`636`	`633`	`void LLOutfitsList::applyFilterToTab(`
`637`	`634`	`const LLUUID& category_id,`
`638`		`- LLAccordionCtrlTab* tab,`
	`635`	`+ LLOutfitAccordionCtrlTab* tab,`
`639`	`636`	`const std::string& filter_substring)`
`640`	`637`	`{`
	`638`	`+ LL_PROFILE_ZONE_SCOPED;`
`641`	`639`	`if (!tab) return;`
`642`	`640`	`LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());`
`643`	`641`	`if (!list) return;`
`@@ -649,6 +647,7 @@ void LLOutfitsList::applyFilterToTab(`
`649`	`647`	`LLStringUtil::toUpper(cur_filter);`
`650`	`648`
`651`	`649`	`tab->setTitle(tab->getTitle(), cur_filter);`
	`650`	`+ tab->setFilterGeneration(getFilterGeneration());`
`652`	`651`
`653`	`652`	`if (std::string::npos == title.find(cur_filter))`
`654`	`653`	`{`
`@@ -772,7 +771,7 @@ void LLOutfitsList::onCOFChanged()`
`772`	`771`	`outfits_map_t::iterator map_iter = mOutfitsMap.begin(), map_end = mOutfitsMap.end();`
`773`	`772`	`while (map_iter != map_end)`
`774`	`773`	`{`
`775`		`- LLAccordionCtrlTab* tab = (map_iter++)->second;`
	`774`	`+ LLOutfitAccordionCtrlTab* tab = (map_iter++)->second;`
`776`	`775`	`if (!tab) continue;`
`777`	`776`
`778`	`777`	`LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());`
`@@ -803,7 +802,7 @@ void LLOutfitsList::sortOutfits()`
`803`	`802`
`804`	`803`	`void LLOutfitsList::onOutfitRightClick(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& cat_id)`
`805`	`804`	`{`
`806`		`- LLAccordionCtrlTab* tab = dynamic_cast<LLAccordionCtrlTab*>(ctrl);`
	`805`	`+ LLOutfitAccordionCtrlTab* tab = dynamic_cast<LLOutfitAccordionCtrlTab*>(ctrl);`
`807`	`806`	`if (mOutfitMenu && is_tab_header_clicked(tab, y) && cat_id.notNull())`
`808`	`807`	`{`
`809`	`808`	`// Focus tab header to trigger tab selection change.`
`@@ -826,7 +825,7 @@ void LLOutfitsList::handleInvFavColorChange()`
`826`	`825`	`++iter)`
`827`	`826`	`{`
`828`	`827`	`if (!iter->second) continue;`
`829`		`- LLOutfitAccordionCtrlTab* tab = (LLOutfitAccordionCtrlTab*)iter->second;`
	`828`	`+ LLOutfitAccordionCtrlTab* tab = iter->second;`
`830`	`829`
`831`	`830`	`// refresh font color`
`832`	`831`	`tab->setFavorite(tab->getFavorite());`
`@@ -853,7 +852,7 @@ void LLOutfitsList::onChangeSortOrder(const LLSD& userdata)`
`853`	`852`	`{`
`854`	`853`	`for (outfits_map_t::value_type& outfit : mOutfitsMap)`
`855`	`854`	`{`
`856`		`- LLAccordionCtrlTab* tab = outfit.second;`
	`855`	`+ LLOutfitAccordionCtrlTab* tab = outfit.second;`
`857`	`856`	`const LLUUID& category_id = outfit.first;`
`858`	`857`	`if (!tab) continue;`
`859`	`858`
`@@ -894,7 +893,7 @@ LLOutfitListGearMenuBase* LLOutfitsList::createGearMenu()`
`894`	`893`	`}`
`895`	`894`
`896`	`895`
`897`		`-bool is_tab_header_clicked(LLAccordionCtrlTab* tab, S32 y)`
	`896`	`+bool is_tab_header_clicked(LLOutfitAccordionCtrlTab* tab, S32 y)`
`898`	`897`	`{`
`899`	`898`	`if(!tab \|\| !tab->getHeaderVisible()) return false;`
`900`	`899`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ void LLPanelAppearanceTab::setFilterSubString(const std::string& new_string)`
`40`	`40`	`{`
`41`	`41`	`std::string old_string = mFilterSubString;`
`42`	`42`	`mFilterSubString = new_string;`
	`43`	`+ mFilterGeneration++;`
`43`	`44`	`onFilterSubStringChanged(mFilterSubString, old_string);`
`44`	`45`	`}`
`45`	`46`
`@@ -52,6 +53,7 @@ void LLPanelAppearanceTab::checkFilterSubString()`
`52`	`53`	`{`
`53`	`54`	`std::string old_string = mFilterSubString;`
`54`	`55`	`mFilterSubString = sRecentFilterSubString;`
	`56`	`+ mFilterGeneration++;`
`55`	`57`	`onFilterSubStringChanged(mFilterSubString, old_string);`
`56`	`58`	`}`
`57`	`59`	`}`