From 575252a19868fa5da036b6daa000eece6429b68a Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 24 Oct 2020 17:35:09 +0200
Subject: [PATCH] FIRE-6399: Brute-force method to make outfits list search
 filter useful and not locking up the entire viewer by not auto-filtering
 after each keypress

---
 indra/newview/llsidepanelappearance.cpp                |  5 ++++-
 indra/newview/llsidepanelappearance.h                  | 10 ++++++++--
 .../skins/ansastorm/xui/en/sidepanel_appearance.xml    |  3 ++-
 .../skins/default/xui/da/sidepanel_appearance.xml      |  2 +-
 .../skins/default/xui/de/sidepanel_appearance.xml      |  2 +-
 .../skins/default/xui/en/sidepanel_appearance.xml      |  3 ++-
 .../skins/default/xui/es/sidepanel_appearance.xml      |  2 +-
 .../skins/default/xui/fr/sidepanel_appearance.xml      |  2 +-
 .../skins/default/xui/it/sidepanel_appearance.xml      |  2 +-
 .../skins/default/xui/ja/sidepanel_appearance.xml      |  5 +----
 .../skins/default/xui/pl/sidepanel_appearance.xml      |  2 +-
 .../skins/default/xui/pt/sidepanel_appearance.xml      |  2 +-
 .../skins/default/xui/ru/sidepanel_appearance.xml      |  2 +-
 .../skins/default/xui/tr/sidepanel_appearance.xml      |  2 +-
 .../skins/default/xui/zh/sidepanel_appearance.xml      |  2 +-
 .../skins/starlight/xui/en/sidepanel_appearance.xml    |  3 ++-
 .../skins/starlightcui/xui/en/sidepanel_appearance.xml |  3 ++-
 17 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 26d5facf1b..bdf5a3a2bd 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -104,7 +104,10 @@ BOOL LLSidepanelAppearance::postBuild()
 
 	childSetAction("edit_outfit_btn", boost::bind(&LLSidepanelAppearance::showOutfitEditPanel, this));
 
-	mFilterEditor = getChild<LLFilterEditor>("Filter");
+	// <FS:Ansariel> Don't filter outfits list on keypress
+	//mFilterEditor = getChild<LLFilterEditor>("Filter");
+	mFilterEditor = findChild<LLSearchEditor>("Filter");
+	// </FS:Ansariel>
 	if (mFilterEditor)
 	{
 		mFilterEditor->setCommitCallback(boost::bind(&LLSidepanelAppearance::onFilterEdit, this, _2));
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h
index 1db7ec4a9c..90025d9619 100644
--- a/indra/newview/llsidepanelappearance.h
+++ b/indra/newview/llsidepanelappearance.h
@@ -33,7 +33,10 @@
 #include "llinventory.h"
 #include "llpaneloutfitedit.h"
 
-class LLFilterEditor;
+// <FS:Ansariel> Don't filter outfits list on keypress
+//class LLFilterEditor;
+class LLSearchEditor;
+// </FS:Ansariel>
 class LLCurrentlyWornFetchObserver;
 class LLPanelEditWearable;
 class LLViewerWearable;
@@ -91,7 +94,10 @@ private:
 	void toggleOutfitEditPanel(BOOL visible, BOOL disable_camera_switch = FALSE);
 	void toggleWearableEditPanel(BOOL visible, LLViewerWearable* wearable = NULL, BOOL disable_camera_switch = FALSE);
 
-	LLFilterEditor*			mFilterEditor;
+	// <FS:Ansariel> Don't filter outfits list on keypress
+	//LLFilterEditor*			mFilterEditor;
+	LLSearchEditor*				mFilterEditor;
+	// </FS:Ansariel>
 	LLPanelOutfitsInventory* mPanelOutfitsInventory;
 	LLPanelOutfitEdit*		mOutfitEdit;
 	LLPanelEditWearable*	mEditWearable;
diff --git a/indra/newview/skins/ansastorm/xui/en/sidepanel_appearance.xml b/indra/newview/skins/ansastorm/xui/en/sidepanel_appearance.xml
index 244b50c60c..07e20514c3 100644
--- a/indra/newview/skins/ansastorm/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/ansastorm/xui/en/sidepanel_appearance.xml
@@ -108,7 +108,8 @@ width="415">
       top="6"
       width="24" />
    </panel>
-   <filter_editor
+   <search_editor
+   clear_button_visible="true"
    height="23"
    follows="left|top|right"
    layout="topleft"
diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
index c5caefe070..aa7e408cad 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
@@ -12,5 +12,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="Redigér dette sæt"/>
 	</panel>
-	<filter_editor label="Filtrér sæt" name="Filter"/>
+	<search_editor label="Filtrér sæt" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
index 7fb9b34e0a..4f15a5ae43 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
@@ -15,5 +15,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="Dieses Outfit bearbeiten"/>
 	</panel>
-	<filter_editor label="Outfits filtern" name="Filter"/>
+	<search_editor label="Outfits filtern" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 6761df792a..83a1257c2a 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -108,7 +108,8 @@ width="333">
       top="6"
       width="24" />
    </panel>
-   <filter_editor
+   <search_editor
+   clear_button_visible="true"
    height="23"
    follows="left|top|right"
    layout="topleft"
diff --git a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml
index bdef89c392..71d7e160ae 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml
@@ -12,5 +12,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="Editar este vestuario"/>
 	</panel>
-	<filter_editor label="Filtrar los vestuarios" name="Filter"/>
+	<search_editor label="Filtrar los vestuarios" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
index 2949d6a177..f048e067ab 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
@@ -11,5 +11,5 @@
 		<text name="currentlook_name">(Chargement)</text>
 		<button name="edit_outfit_btn" tool_tip="Modifier cette tenue"/>
 	</panel>
-	<filter_editor label="Filtrer les tenues" name="Filter"/>
+	<search_editor label="Filtrer les tenues" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
index 46db3fddbe..bad6731263 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
@@ -7,5 +7,5 @@
 	<panel name="panel_currentlook">
 		<button label="" name="edit_outfit_btn" tool_tip="Modifica questo abito"/>
 	</panel>
-	<filter_editor label="Filtri per gli abiti" name="Filter"/>
+	<search_editor label="Filtri per gli abiti" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
index 2116d8a3a1..fc56fad246 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
@@ -15,8 +15,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="このアウトフィットを編集"/>
 	</panel>
-	<filter_editor label="アウトフィットをフィルター" name="Filter"/>
-	<panel name="panel_outfits_inventory" />
-	<panel name="panel_outfit_edit" />
-	<panel name="panel_edit_wearable" />
+	<search_editor label="アウトフィットをフィルター" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
index 0f3a18e8e4..8917ee7de2 100644
--- a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
@@ -7,5 +7,5 @@
 	<panel name="panel_currentlook">
 		<button name="edit_outfit_btn" tool_tip="Edytuj ten strój"/>
 	</panel>
-	<filter_editor label="Filtruj stroje" name="Filter"/>
+	<search_editor label="Filtruj stroje" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
index a5048e63b2..9293ac7ed9 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
@@ -12,5 +12,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="Editar este look"/>
 	</panel>
-	<filter_editor label="Filtrar looks" name="Filter"/>
+	<search_editor label="Filtrar looks" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml
index ff4fdf8c2f..815a48fd3a 100644
--- a/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml
@@ -10,5 +10,5 @@
 		</text>
 		<button name="edit_outfit_btn" tool_tip="Редактировать комплект"/>
 	</panel>
-	<filter_editor label="Фильтр комплектов одежды" name="Filter"/>
+	<search_editor label="Фильтр комплектов одежды" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml
index b632f21cf5..a79c467c77 100644
--- a/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml
@@ -15,5 +15,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="Bu dış görünümü düzenle"/>
 	</panel>
-	<filter_editor label="Dış Görünümleri Filtrele" name="Filter"/>
+	<search_editor label="Dış Görünümleri Filtrele" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
index 83a9bdf6a5..81ed1c1d6f 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
@@ -15,5 +15,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="編輯這裝扮"/>
 	</panel>
-	<filter_editor label="裝扮過濾器" name="Filter"/>
+	<search_editor label="裝扮過濾器" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/starlight/xui/en/sidepanel_appearance.xml b/indra/newview/skins/starlight/xui/en/sidepanel_appearance.xml
index 20730e6c12..1f252a06b1 100644
--- a/indra/newview/skins/starlight/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/starlight/xui/en/sidepanel_appearance.xml
@@ -108,7 +108,8 @@ width="333">
       top="6"
       width="24" />
    </panel>
-   <filter_editor
+   <search_editor
+   clear_button_visible="true"
    height="23"
    follows="left|top|right"
    layout="topleft"
diff --git a/indra/newview/skins/starlightcui/xui/en/sidepanel_appearance.xml b/indra/newview/skins/starlightcui/xui/en/sidepanel_appearance.xml
index b0f8fea884..6a64942ed6 100644
--- a/indra/newview/skins/starlightcui/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/starlightcui/xui/en/sidepanel_appearance.xml
@@ -110,7 +110,8 @@ width="333">
       top="6"
       width="24" />
    </panel>
-   <filter_editor
+   <search_editor
+   clear_button_visible="true"
    height="23"
    follows="left|top|right"
    layout="topleft"