3 files changed, 73 insertions, 15 deletions

diff --git a/linden/indra/newview/llfloatersettingsdebug.cpp b/linden/indra/newview/llfloatersettingsdebug.cpp
index 0aa0607..9e4a04c 100644
--- a/linden/indra/newview/llfloatersettingsdebug.cpp
+++ b/linden/indra/newview/llfloatersettingsdebug.cpp
@@ -36,6 +36,8 @@
 #include "lluictrlfactory.h"
 #include "llfirstuse.h"
 #include "llcombobox.h"
+#include "lllineeditor.h"
+#include "llscrolllistctrl.h"
 #include "llspinctrl.h"
 #include "llcolorswatch.h"
 #include "llviewercontrol.h"
@@ -58,7 +60,8 @@ LLFloaterSettingsDebug::~LLFloaterSettingsDebug()
 
 BOOL LLFloaterSettingsDebug::postBuild()
 {
-        LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
+        mSettingsNames.clear();
+        mComboNames = getChild<LLComboBox>("settings_combo");
 
         struct f : public LLControlGroup::ApplyFunctor
         {
@@ -71,16 +74,16 @@ BOOL LLFloaterSettingsDebug::postBuild()
                                 combo->add(name, (void*)control);
                         }
                 }
-        } func(settings_combo);
+        } func(mComboNames);
 
         gSavedSettings.applyToAll(&func);
         gSavedPerAccountSettings.applyToAll(&func);
         gColors.applyToAll(&func);
 
-        settings_combo->sortByName();
-        settings_combo->setCommitCallback(onSettingSelect);
-        settings_combo->setCallbackUserData(this);
-        settings_combo->updateSelection();
+        mComboNames->sortByName();
+        mComboNames->setCommitCallback(onSettingSelect);
+        mComboNames->setCallbackUserData(this);
+        //mComboNames->updateSelection();
 
         childSetCommitCallback("val_spinner_1", onCommitSettings);
         childSetUserData("val_spinner_1", this);
@@ -98,14 +101,23 @@ BOOL LLFloaterSettingsDebug::postBuild()
         childSetUserData("color_swatch", this);
         childSetAction("default_btn", onClickDefault, this);
         mComment = getChild<LLTextEditor>("comment_text");
+
+        getChild<LLSearchEditor>("control_search")->setSearchCallback(onSearchEdit, this);
+        
+        // There really are many better ways to do this, but laziness... she is powerful... -- MC
+        mComboNames->getAllData(mSettingsNames);
+        getChild<LLSearchEditor>("control_search")->setEnabled(!(mSettingsNames.empty()));
+
         return TRUE;
 }
 
 void LLFloaterSettingsDebug::draw()
 {
-        LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
-        LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
-        updateControl(controlp);
+        if (mComboNames)
+        {
+                LLControlVariable* controlp = (LLControlVariable*)mComboNames->getCurrentUserdata();
+                updateControl(controlp);
+        }
 
         LLFloater::draw();
 }
@@ -134,11 +146,46 @@ void LLFloaterSettingsDebug::onSettingSelect(LLUICtrl* ctrl, void* user_data)
 }
 
 //static
+void LLFloaterSettingsDebug::onSearchEdit(const std::string& search_string, void* user_data)
+{
+        if (search_string.empty())
+        {
+                return;
+        }
+
+        LLFloaterSettingsDebug* self = (LLFloaterSettingsDebug*)user_data;
+        if (!self || !self->mComboNames)
+        {
+                return;
+        }
+
+        std::string search_text = search_string;
+        LLStringUtil::trim(search_text);
+        LLStringUtil::toUpper(search_text);
+
+        std::string settings_name("");
+        size_t found;
+        for (std::vector<LLScrollListItem*>::iterator vIt = self->mSettingsNames.begin();
+                 vIt != self->mSettingsNames.end(); ++vIt)
+        {
+                settings_name = (*vIt)->getValue().asString();
+                LLStringUtil::toUpper(settings_name);
+                found = settings_name.find(search_text);
+                if (found != std::string::npos)
+                {
+                        // search and update combo on partial matches
+                        self->mComboNames->selectByValue((*vIt)->getValue());
+                        break;
+                }
+        }
+}
+
+//static
 void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
 {
         LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
 
-        LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
+        LLComboBox* settings_combo = floaterp->mComboNames;
         LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
 
         LLVector3 vector;
@@ -212,7 +259,7 @@ void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
 void LLFloaterSettingsDebug::onClickDefault(void* user_data)
 {
         LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
-        LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
+        LLComboBox* settings_combo = floaterp->mComboNames;
         LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
 
         if (controlp)
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
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
index a8c0840..1dc8a5e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="215" name="settings_debug"
+     can_resize="false" height="235" name="settings_debug"
      title="Debug Settings" width="350">
-        <combo_box allow_text_entry="true" bottom="-50" follows="top|left" font="SansSerifSmall"
+  <search_editor bottom="-45" height="20" name="control_search" visible="true" width="320" 
+                 left="15" label="Type here to search" />
+        <combo_box allow_text_entry="false" bottom_delta="-30" follows="top|left" font="SansSerifSmall"
              height="20" left="15" max_chars="255" name="settings_combo" />
-        <text_editor bottom_delta="-75" enabled="false" height="60" width="320" hide_scrollbar="true"
+        <text_editor bottom_delta="-70" enabled="false" height="60" width="320" hide_scrollbar="true"
              name="comment_text" word_wrap="true" />
         <combo_box bottom_delta="-30" follows="top|left" font="SansSerifSmall" height="20"
              left="15" name="boolean_combo" visible="false">
@@ -15,7 +17,7 @@
                         FALSE
                 </combo_item>
         </combo_box>
-        <line_editor bottom_delta="0" height="20" name="val_text" visible="false" width="300" />
+        <line_editor bottom_delta="0" height="20" name="val_text" visible="false" width="320" />
         <color_swatch bottom="30" can_apply_immediately="true" height="55" label="Color"
              name="color_swatch" visible="true" width="37" />
         <spinner bottom_delta="25" height="20" label="x" label_width="40" max_val="10000000"