From 8cea1705d1c4d32d8bf9932374cb787d461512e6 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 23 Apr 2017 18:49:55 -0400
Subject: [PATCH] You asked for it, here's Classic Search back!

---
 indra/newview/llfloaterdirectory.cpp                     | 9 ++++++---
 .../skins/default/xui/en-us/floater_directory.xml        | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llfloaterdirectory.cpp b/indra/newview/llfloaterdirectory.cpp
index b5b37bfcc..a856e4d5f 100644
--- a/indra/newview/llfloaterdirectory.cpp
+++ b/indra/newview/llfloaterdirectory.cpp
@@ -227,6 +227,7 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
 	factory_map["people_panel"] = LLCallbackMap(createPeople, this);
 	factory_map["groups_panel"] = LLCallbackMap(createGroups, this);
 	factory_map[market_panel] = LLCallbackMap(LLPanelDirMarket::create, this);
+	factory_map["find_all_panel"] = LLCallbackMap(createFindAll, this);
 	factory_map["showcase_panel"] = LLCallbackMap(createShowcase, this);
 	if (secondlife)
 	{
@@ -234,7 +235,6 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
 	}
 	else
 	{
-		factory_map["find_all_panel"] = LLCallbackMap(createFindAll, this);
 		factory_map["find_all_old_panel"] = LLCallbackMap(createFindAllOld, this);
 	}
 
@@ -260,8 +260,11 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
 	if (secondlife)
 	{
 		// Remove unused tabs
-		container->removeTabPanel(getChild<LLPanel>("find_all_panel"));
 		container->removeTabPanel(getChild<LLPanel>("find_all_old_panel"));
+		LLPanel* p = getChild<LLPanel>("find_all_panel");
+		container->removeTabPanel(p); // This should be at the end
+		p->setLabel(p->getString("classic_label")); // Give it a special label
+		container->addTabPanel(p, p->getLabel());
 	}
 	else
 	{
@@ -634,7 +637,7 @@ void LLFloaterDirectory::toggleFind(void*)
 			|| (inst.destinationGuideURL().empty() && panel == "showcase_panel"))
 				panel = "find_all_old_panel";
 		}
-		else if (panel == "find_all_panel" || panel == "find_all_old_panel") panel = "web_panel";
+		else if (panel == "find_all_old_panel") panel = "web_panel";
 
 		showPanel(panel);
 
diff --git a/indra/newview/skins/default/xui/en-us/floater_directory.xml b/indra/newview/skins/default/xui/en-us/floater_directory.xml
index 5d077dffc..e28adc65e 100644
--- a/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -72,6 +72,7 @@
 			<string name="not_found_text">
 				None Found.
 			</string>
+			<string name="classic_label" value="Classic"/>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
 			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"