summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
-rw-r--r--indra/newview/llfloaterpreference.h28
1 files changed, 16 insertions, 12 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index da96e68f5e..54f985193a 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -36,6 +36,7 @@
#include "llfloater.h"
#include "llavatarpropertiesprocessor.h"
#include "llconversationlog.h"
+#include "llsearcheditor.h"
class LLConversationLogObserver;
class LLPanelPreference;
@@ -47,6 +48,14 @@ class LLSliderCtrl;
class LLSD;
class LLTextBox;
+namespace ll
+{
+ namespace prefs
+ {
+ struct SearchData;
+ }
+}
+
typedef std::map<std::string, std::string> notifications_map;
typedef enum
@@ -207,6 +216,12 @@ private:
std::string mSavedCameraPreset;
std::string mSavedGraphicsPreset;
LOG_CLASS(LLFloaterPreference);
+
+ LLSearchEditor *mFilterEdit;
+ std::unique_ptr< ll::prefs::SearchData > mSearchData;
+
+ void onUpdateFilterTerm( bool force = false );
+ void collectSearchableItems();
};
class LLPanelPreference : public LLPanel
@@ -256,18 +271,6 @@ private:
LOG_CLASS(LLPanelPreference);
};
-class LLPanelPreferenceView : public LLPanelPreference
-{
-public:
- BOOL postBuild();
- void draw();
- void setPresetText();
-
-private:
- void onPresetsListChangeCamera();
- LOG_CLASS(LLPanelPreferenceView);
-};
-
class LLPanelPreferenceGraphics : public LLPanelPreference
{
public:
@@ -285,6 +288,7 @@ protected:
bool hasDirtyChilds();
private:
+
void onPresetsListChange();
LOG_CLASS(LLPanelPreferenceGraphics);
};