From 6f9883429ccdfbf63738051e76331fd68b3e627f Mon Sep 17 00:00:00 2001
From: Ansariel Hiller <Ansariel@users.noreply.github.com>
Date: Thu, 29 May 2025 15:30:41 +0200
Subject: Remove duplicated code (#4187)

---
 indra/newview/lloutfitgallery.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index 80cc01f1ab..3adee9fa16 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -832,17 +832,6 @@ void LLOutfitGallery::updateAddedCategory(LLUUID cat_id)
         return;
     }
 
-    if (!isOutfitFolder(cat))
-    {
-        // Assume a subfolder that contains or will contain outfits, track it
-        const LLUUID outfits = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
-        mCategoriesObserver->addCategory(cat_id, [this, outfits]()
-        {
-            observerCallback(outfits);
-        });
-        return;
-    }
-
     LLOutfitGalleryItem* item = buildGalleryItem(cat->getName(), cat_id, cat->getIsFavorite());
     mOutfitMap.insert(LLOutfitGallery::outfit_map_value_t(cat_id, item));
     item->setRightMouseDownCallback(boost::bind(&LLOutfitListBase::outfitRightClickCallBack, this,
-- 
cgit v1.2.3


From 2d0f9e473768b16e2a1df1eafe1e646d316ff820 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 29 May 2025 16:27:51 +0300
Subject: #3367 Fix post-merge regression

---
 .../default/xui/en/panel_preferences_graphics1.xml | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 60ed9bf35e..bf07ae4d68 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -230,40 +230,6 @@
     width="128">
      m
   </text>
-  <slider
-    control_name="IndirectMaxNonImpostors"
-    name="IndirectMaxNonImpostors"
-    decimal_digits="0"
-    increment="1"
-    initial_value="12"
-    show_text="false"
-    min_val="1"
-    max_val="66"
-    label="Maximum number of animated avatars:"
-    follows="left|top"
-    layout="topleft"
-    height="16"
-    label_width="240"
-    left="30"
-    top_delta="40"
-    width="393">
-      <slider.commit_callback
-        function="Pref.UpdateIndirectMaxNonImpostors"
-        parameter="IndirectNonImpostorsText" />
-  </slider>
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
-    layout="topleft"
-    top_delta="0"
-    left_delta="397"
-    text_readonly_color="LabelDisabledColor"
-    name="IndirectMaxNonImpostorsText"
-    width="65">
-      0
-  </text>
 
   <button
   height="23"
-- 
cgit v1.2.3