Ported slviewer-0-v12300-ReinstateOldSearchTabs.patch from the Hippo Viewer (opensim currently uses the old search all)

1 files changed, 11 insertions, 2 deletions

diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 76cb26b..8018c31 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2009, Linden Research, Inc.
+ * Copyright (c) 2002-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -93,6 +93,7 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
         // Build the floater with our tab panel classes
 
         LLCallbackMap::map_t factory_map;
+        factory_map["find_all_old_panel"] = LLCallbackMap(createFindAllOld, this);
         factory_map["find_all_panel"] = LLCallbackMap(createFindAll, this);
         factory_map["classified_panel"] = LLCallbackMap(createClassified, this);
         factory_map["events_panel"] = LLCallbackMap(createEvents, this);
@@ -119,6 +120,7 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
                 mPanelAvatarp->selectTab(0);
         }
         
+        childSetTabChangeCallback("Directory Tabs", "find_all_old_panel", onTabChanged, this);
         childSetTabChangeCallback("Directory Tabs", "find_all_panel", onTabChanged, this);
         childSetTabChangeCallback("Directory Tabs", "classified_panel", onTabChanged, this);
         childSetTabChangeCallback("Directory Tabs", "events_panel", onTabChanged, this);
@@ -206,7 +208,14 @@ void* LLFloaterDirectory::createPeople(void* userdata)
 void* LLFloaterDirectory::createGroups(void* userdata)
 {
         LLFloaterDirectory *self = (LLFloaterDirectory*)userdata;
-        return new LLPanelDirGroups("people_groups", self);
+        return new LLPanelDirGroups("groups_panel", self);
+}
+
+// static
+void *LLFloaterDirectory::createFindAllOld(void* userdata)
+{
+        LLFloaterDirectory *self = (LLFloaterDirectory*)userdata;
+        return new LLPanelDirFindAllOld("find_all_old_panel", self);
 }
 
 // static