Skip to content
Snippets Groups Projects
Commit f75b6eae authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Import ansa's brute force fix for outfit filtering

parent 66d3581d
No related branches found
No related tags found
No related merge requests found
...@@ -102,7 +102,7 @@ BOOL LLSidepanelAppearance::postBuild() ...@@ -102,7 +102,7 @@ BOOL LLSidepanelAppearance::postBuild()
childSetAction("edit_outfit_btn", boost::bind(&LLSidepanelAppearance::showOutfitEditPanel, this)); childSetAction("edit_outfit_btn", boost::bind(&LLSidepanelAppearance::showOutfitEditPanel, this));
mFilterEditor = getChild<LLFilterEditor>("Filter"); mFilterEditor = findChild<LLSearchEditor>("Filter");
if (mFilterEditor) if (mFilterEditor)
{ {
mFilterEditor->setCommitCallback(boost::bind(&LLSidepanelAppearance::onFilterEdit, this, _2)); mFilterEditor->setCommitCallback(boost::bind(&LLSidepanelAppearance::onFilterEdit, this, _2));
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "llinventory.h" #include "llinventory.h"
#include "llpaneloutfitedit.h" #include "llpaneloutfitedit.h"
class LLFilterEditor; class LLSearchEditor;
class LLCurrentlyWornFetchObserver; class LLCurrentlyWornFetchObserver;
class LLPanelEditWearable; class LLPanelEditWearable;
class LLViewerWearable; class LLViewerWearable;
...@@ -85,7 +85,7 @@ class LLSidepanelAppearance final : public LLPanel ...@@ -85,7 +85,7 @@ class LLSidepanelAppearance final : public LLPanel
void toggleOutfitEditPanel(BOOL visible, BOOL disable_camera_switch = FALSE); void toggleOutfitEditPanel(BOOL visible, BOOL disable_camera_switch = FALSE);
void toggleWearableEditPanel(BOOL visible, LLViewerWearable* wearable = NULL, BOOL disable_camera_switch = FALSE); void toggleWearableEditPanel(BOOL visible, LLViewerWearable* wearable = NULL, BOOL disable_camera_switch = FALSE);
LLFilterEditor* mFilterEditor; LLSearchEditor* mFilterEditor;
LLPanelOutfitsInventory* mPanelOutfitsInventory; LLPanelOutfitsInventory* mPanelOutfitsInventory;
LLPanelOutfitEdit* mOutfitEdit; LLPanelOutfitEdit* mOutfitEdit;
LLPanelEditWearable* mEditWearable; LLPanelEditWearable* mEditWearable;
......
...@@ -106,7 +106,9 @@ width="333"> ...@@ -106,7 +106,9 @@ width="333">
top="6" top="6"
width="24" /> width="24" />
</panel> </panel>
<filter_editor <search_editor
clear_button_visible="true"
text_pad_left="10"
height="23" height="23"
follows="left|top|right" follows="left|top|right"
layout="topleft" layout="topleft"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment