From c30ad11e4bdec787025e930a36f3522cf326cc43 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 1 Jun 2026 16:33:07 +0300
Subject: #5798 fix displaying outfit Search results and update default
 filtering

---
 indra/newview/app_settings/settings.xml |  2 +-
 indra/newview/lloutfitslist.cpp         | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ccaa12b8ef..8086afb865 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14416,7 +14416,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>OutfitOperationsTimeout</key>
     <map>
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 7db79c7010..a5137984f2 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -519,6 +519,22 @@ void LLOutfitsList::resetItemSelection(LLWearableItemsList* list, const LLUUID&
     list->resetSelection();
     mItemSelected = false;
     signalSelectionOutfitUUID(category_id);
+
+    // If filtering was applied while tab was collapsed, item visibility is updated but the parent tab height might not be updated.
+    // Force rearrange to recompute the height, when tab is expanded.
+    static LLCachedControl<bool> show_all_items(gSavedSettings, "OutfitListFilterFullList", 1);
+    if (!show_all_items)
+    {
+        outfits_map_t::const_iterator tab_iter = mOutfitsMap.find(category_id);
+        if (tab_iter != mOutfitsMap.end())
+        {
+            LLOutfitAccordionCtrlTab* tab = tab_iter->second;
+            if (tab && tab->getDisplayChildren())
+            {
+                list->notify(LLSD().with("rearrange", true));
+            }
+        }
+    }
 }
 
 void LLOutfitsList::onChangeOutfitSelection(LLWearableItemsList* list, const LLUUID& category_id)
@@ -1648,7 +1664,7 @@ bool LLOutfitListSortMenu::onEnable(LLSD::String param)
     }
     else if ("show_entire_outfit" == param)
     {
-        static LLCachedControl<bool> filter_mode(gSavedSettings, "OutfitListFilterFullList", 0);
+        static LLCachedControl<bool> filter_mode(gSavedSettings, "OutfitListFilterFullList", 1);
         return filter_mode;
     }
 
-- 
cgit v1.3