1 files changed, 36 insertions, 0 deletions

diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp
index 0bf3ab2..2ee7307 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -464,6 +464,40 @@ class LLDoCreateFloater : public inventory_listener_t
         }
 };
 
+//Handles the search type buttons
+class SetSearchType : public inventory_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string search_type = userdata.asString();
+                if(search_type == "name")
+                {
+                        gSavedSettings.setU32("InventorySearchType", 0);
+
+                        mPtr->getControl("Inventory.SearchByName")->setValue(TRUE);
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(FALSE);                 
+                        mPtr->getControl("Inventory.SearchByAll")->setValue(FALSE);
+                }
+                else if(search_type == "creator")
+                {
+                        gSavedSettings.setU32("InventorySearchType", 1);
+
+                        mPtr->getControl("Inventory.SearchByName")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(TRUE);
+                        mPtr->getControl("Inventory.SearchByAll")->setValue(FALSE);
+                }
+                else if(search_type == "all")
+                {
+                        gSavedSettings.setU32("InventorySearchType", 4);
+
+                        mPtr->getControl("Inventory.SearchByName")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByAll")->setValue(TRUE);
+                }
+        return true;
+        }
+};
+
 class LLSetSortBy : public inventory_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -711,6 +745,8 @@ void init_inventory_actions(LLInventoryView *floater)
         (new LLShowFilters())->registerListener(floater, "Inventory.ShowFilters");
         (new LLResetFilter())->registerListener(floater, "Inventory.ResetFilter");
         (new LLSetSortBy())->registerListener(floater, "Inventory.SetSortBy");
+        
+        (new SetSearchType())->registerListener(floater, "Inventory.SetSearchBy");
 }
 
 void init_inventory_panel_actions(LLInventoryPanel *panel)