From f75b6eaedcf83109cb700310cc84d7a8c62c03d8 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 2 May 2022 18:03:05 -0400
Subject: [PATCH] Import ansa's brute force fix for outfit filtering
---
indra/newview/llsidepanelappearance.cpp | 2 +-
indra/newview/llsidepanelappearance.h | 4 ++--
indra/newview/skins/default/xui/en/sidepanel_appearance.xml | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 7fbe416a4e8..0e284e3c078 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -102,7 +102,7 @@ BOOL LLSidepanelAppearance::postBuild()
childSetAction("edit_outfit_btn", boost::bind(&LLSidepanelAppearance::showOutfitEditPanel, this));
- mFilterEditor = getChild<LLFilterEditor>("Filter");
+ mFilterEditor = findChild<LLSearchEditor>("Filter");
if (mFilterEditor)
{
mFilterEditor->setCommitCallback(boost::bind(&LLSidepanelAppearance::onFilterEdit, this, _2));
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h
index b784edf5d04..8ec6d8ad903 100644
--- a/indra/newview/llsidepanelappearance.h
+++ b/indra/newview/llsidepanelappearance.h
@@ -33,7 +33,7 @@
#include "llinventory.h"
#include "llpaneloutfitedit.h"
-class LLFilterEditor;
+class LLSearchEditor;
class LLCurrentlyWornFetchObserver;
class LLPanelEditWearable;
class LLViewerWearable;
@@ -85,7 +85,7 @@ class LLSidepanelAppearance final : public LLPanel
void toggleOutfitEditPanel(BOOL visible, BOOL disable_camera_switch = FALSE);
void toggleWearableEditPanel(BOOL visible, LLViewerWearable* wearable = NULL, BOOL disable_camera_switch = FALSE);
- LLFilterEditor* mFilterEditor;
+ LLSearchEditor* mFilterEditor;
LLPanelOutfitsInventory* mPanelOutfitsInventory;
LLPanelOutfitEdit* mOutfitEdit;
LLPanelEditWearable* mEditWearable;
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 6b882d799af..14ea609fbf1 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -106,7 +106,9 @@ width="333">
top="6"
width="24" />
</panel>
- <filter_editor
+ <search_editor
+ clear_button_visible="true"
+ text_pad_left="10"
height="23"
follows="left|top|right"
layout="topleft"
--
GitLab