diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 7fbe416a4e83d2acf5147dd36bc1514fe0c42fb8..0e284e3c07864fc9980b438d235af1e11fe369d2 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 b784edf5d04bb8f731ca903624b2b222997e2f7a..8ec6d8ad90341eefffa28b44dfede13d521b94a7 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 6b882d799aff77458a58864dd7c9b9e6a6cbae1d..14ea609fbf1e39430065930f75775968ea9031ff 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"