Added commit callback for Quick Filter.

2 files changed, 19 insertions, 0 deletions

diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index f9dd70d..edc1ca7 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -44,6 +44,7 @@
 #include "llradiogroup.h"
 #include "llspinctrl.h"
 #include "lltextbox.h"
+#include "llcombobox.h"
 #include "llui.h"
 
 #include "llfirstuse.h"
@@ -549,6 +550,12 @@ void LLInventoryView::init(LLInventoryModel* inventory)
                 mSearchEditor->setSearchCallback(onSearchEdit, this);
         }
 
+        mQuickFilterCombo = getChild<LLComboBox>("Quick Filter");
+        if (mQuickFilterCombo)
+        {
+                mQuickFilterCombo->setCommitCallback(onQuickFilterCommit);
+        }
+
         sActiveViews.put(this);
 
         gInventory.addObserver(this);
@@ -981,6 +988,15 @@ void LLInventoryView::onSearchEdit(const std::string& search_string, void* user_
 }
 
 
+//static
+void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data)
+{
+        LLComboBox* quickfilter = (LLComboBox*)ctrl;
+
+        llinfos << "Quick Filter: " << quickfilter->getSimple() << llendl;
+}
+
+
 // static
 // BOOL LLInventoryView::incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward)
 // {
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index a37d370..ec621ec 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -58,6 +58,7 @@ class LLCheckBoxCtrl;
 class LLSpinCtrl;
 class LLScrollableContainerView;
 class LLTextBox;
+class LLComboBox;
 class LLIconCtrl;
 class LLSaveFolderState;
 class LLSearchEditor;
@@ -239,6 +240,7 @@ public:
         static void onFoldersByName(void *user_data);
         static BOOL checkFoldersByName(void *user_data);
         static void onSearchEdit(const std::string& search_string, void* user_data );
+  static void onQuickFilterCommit(LLUICtrl* ctrl, void* user_data);
         static void onFilterSelected(void* userdata, bool from_click);
         static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
 
@@ -259,6 +261,7 @@ protected:
 
 protected:
         LLSearchEditor*                         mSearchEditor;
+        LLComboBox*                                             mQuickFilterCombo;
         LLTabContainer*                         mFilterTabs;
         LLHandle<LLFloater>                             mFinderHandle;
         LLInventoryPanel*                       mActivePanel;