Merge remote-tracking branch 'imprudence/exp' into exp

Conflicts (for future reference):
	linden/indra/llcommon/llstring.cpp
	linden/indra/newview/llpanelnetwork.cpp
	linden/indra/newview/llselectmgr.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/lltoolmgr.cpp
	linden/indra/newview/llvoavatar.cpp

1 files changed, 9 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloatersettingsdebug.h b/linden/indra/newview/llfloatersettingsdebug.h
index e08e6b5..3e14eaa 100644
--- a/linden/indra/newview/llfloatersettingsdebug.h
+++ b/linden/indra/newview/llfloatersettingsdebug.h
@@ -37,6 +37,9 @@
 #include "llfloater.h"
 #include "lltexteditor.h"
 
+class LLComboBox;
+class LLScrollListItem;
+
 class LLFloaterSettingsDebug : public LLFloater
 {
 public:
@@ -56,6 +59,12 @@ public:
 protected:
         static LLFloaterSettingsDebug* sInstance;
         LLTextEditor* mComment;
+
+private:
+        LLComboBox* mComboNames;
+        std::vector<LLScrollListItem*> mSettingsNames;
+
+        static void onSearchEdit(const std::string& search_string, void* user_data);
 };
 
 #endif //LLFLOATERDEBUGSETTINGS_H