From 6c1706da69193de3ddbaf69a40e5ba0cad13283e Mon Sep 17 00:00:00 2001
From: Martin Reddy <lynx@lindenlab.com>
Date: Mon, 19 Oct 2009 13:35:10 +0000
Subject: [PATCH] DEV-41358: Remove the code for the old search interface.

This checkin deletes all of the code associated with the old XUI-based
search interface, including LLFloaterDirectory, LLPanelDir*, a global
variable event hack, and the associated XUI file. The new web-based
search interface, LLFloaterSearch, is the way of the future.

Deleted 19 files and 5,838 lines of code.
---
 indra/newview/CMakeLists.txt        | 18 ------------------
 indra/newview/llagent.cpp           |  6 ------
 indra/newview/lleventnotifier.cpp   |  2 --
 indra/newview/llgroupmgr.cpp        |  5 -----
 indra/newview/llmenucommands.cpp    |  1 -
 indra/newview/llpanelclassified.cpp |  8 +-------
 indra/newview/llstartup.cpp         | 11 -----------
 indra/newview/llstatusbar.cpp       |  1 -
 indra/newview/llurldispatcher.cpp   |  1 -
 indra/newview/llviewermenu.cpp      |  4 ----
 indra/newview/llviewerstats.cpp     |  3 ---
 indra/newview/llworldmapview.cpp    |  1 -
 indra/newview/macview_Prefix.h      |  1 -
 13 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index abf0b085cd6..eccce83c747 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -159,7 +159,6 @@ set(viewer_SOURCE_FILES
     llfloatercolorpicker.cpp
     llfloatercustomize.cpp
     llfloaterdaycycle.cpp
-    llfloaterdirectory.cpp
     llfloaterenvsettings.cpp
     llfloaterfriends.cpp
     llfloaterfonttest.cpp
@@ -299,14 +298,6 @@ set(viewer_SOURCE_FILES
     llpanelblockedlist.cpp
     llpanelclassified.cpp
     llpanelcontents.cpp
-    llpaneldirbrowser.cpp
-    llpaneldirclassified.cpp
-    llpaneldirevents.cpp
-    llpaneldirfind.cpp
-    llpaneldirgroups.cpp
-    llpaneldirland.cpp
-    llpaneldirpeople.cpp
-    llpaneldirplaces.cpp
     llpaneleditwearable.cpp
     llpanelevent.cpp
     llpanelface.cpp
@@ -634,7 +625,6 @@ set(viewer_HEADER_FILES
     llfloatercolorpicker.h
     llfloatercustomize.h
     llfloaterdaycycle.h
-    llfloaterdirectory.h
     llfloaterenvsettings.h
     llfloaterfonttest.h
     llfloaterfriends.h
@@ -770,14 +760,6 @@ set(viewer_HEADER_FILES
     llpanelblockedlist.h
     llpanelclassified.h
     llpanelcontents.h
-    llpaneldirbrowser.h
-    llpaneldirclassified.h
-    llpaneldirevents.h
-    llpaneldirfind.h
-    llpaneldirgroups.h
-    llpaneldirland.h
-    llpaneldirpeople.h
-    llpaneldirplaces.h
     llpaneleditwearable.h
     llpanelevent.h
     llpanelface.h
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index c67beda361f..0fa3b1f04df 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -44,7 +44,6 @@
 #include "llfloateractivespeakers.h"
 #include "llfloatercamera.h"
 #include "llfloatercustomize.h"
-#include "llfloaterdirectory.h"
 
 #include "llfloaterland.h"
 #include "llfloatersnapshot.h"
@@ -5433,8 +5432,6 @@ void LLAgent::processAgentDropGroup(LLMessageSystem *msg, void **)
 		LLGroupMgr::getInstance()->clearGroupData(group_id);
 		// close the floater for this group, if any.
 		LLGroupActions::closeGroup(group_id);
-		// refresh the group panel of the search window, if necessary.
-		LLFloaterDirectory::refreshGroup(group_id);
 	}
 	else
 	{
@@ -5512,9 +5509,6 @@ class LLAgentDropGroupViewerNode : public LLHTTPNode
 				LLGroupMgr::getInstance()->clearGroupData(group_id);
 				// close the floater for this group, if any.
 				LLGroupActions::closeGroup(group_id);
-				// refresh the group panel of the search window,
-				//if necessary.
-				LLFloaterDirectory::refreshGroup(group_id);
 			}
 			else
 			{
diff --git a/indra/newview/lleventnotifier.cpp b/indra/newview/lleventnotifier.cpp
index 2c52cf9565e..68a4f317306 100644
--- a/indra/newview/lleventnotifier.cpp
+++ b/indra/newview/lleventnotifier.cpp
@@ -39,7 +39,6 @@
 #include "llnotify.h"
 #include "lleventinfo.h"
 #include "llfloaterreg.h"
-#include "llfloaterdirectory.h"
 #include "llfloaterworldmap.h"
 #include "llagent.h"
 
@@ -199,7 +198,6 @@ bool LLEventNotification::handleResponse(const LLSD& notification, const LLSD& r
 			break;
 		}
 	case 1:
-		gDisplayEventHack = TRUE;
 		LLFloaterReg::showInstance("search", LLSD().insert("panel", "event").insert("id", S32(getEventID())));
 		break;
 	case 2:
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 01d0f2296a6..0626a5c3d31 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -50,7 +50,6 @@
 #include "llstatusbar.h"
 #include "lleconomy.h"
 #include "llviewerwindow.h"
-#include "llfloaterdirectory.h"
 #include "llpanelgroup.h"
 #include "llgroupactions.h"
 #include "lluictrlfactory.h"
@@ -1232,8 +1231,6 @@ void LLGroupMgr::processJoinGroupReply(LLMessageSystem* msg, void ** data)
 		LLGroupMgr::getInstance()->clearGroupData(group_id);
 		// refresh the floater for this group, if any.
 		LLGroupActions::refresh(group_id);
-		// refresh the group panel of the search window, if necessary.
-		LLFloaterDirectory::refreshGroup(group_id);
 	}
 }
 
@@ -1254,8 +1251,6 @@ void LLGroupMgr::processLeaveGroupReply(LLMessageSystem* msg, void ** data)
 		LLGroupMgr::getInstance()->clearGroupData(group_id);
 		// close the floater for this group, if any.
 		LLGroupActions::closeGroup(group_id);
-		// refresh the group panel of the search window, if necessary.
-		LLFloaterDirectory::refreshGroup(group_id);
 	}
 }
 
diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp
index f61177d5810..8dd09d5ec72 100644
--- a/indra/newview/llmenucommands.cpp
+++ b/indra/newview/llmenucommands.cpp
@@ -47,7 +47,6 @@
 #include "llviewercontrol.h"
 #include "llfirstuse.h"
 #include "llfloaterchat.h"
-#include "llfloaterdirectory.h"
 #include "llfloaterworldmap.h"
 #include "lllineeditor.h"
 #include "llnotify.h"
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index 7eaee92778e..a29c9752e6d 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -909,13 +909,7 @@ bool LLPanelClassified::confirmPublish(const LLSD& notification, const LLSD& res
 
 	// Big hack - assume that top picks are always in a browser,
 	// and non-finder-classifieds are always in a tab container.
-	if (mInFinder)
-	{
-		// TODO: enable this
-		//LLPanelDirClassifieds* panel = (LLPanelDirClassifieds*)getParent();
-		//panel->renameClassified(mClassifiedID, mNameEditor->getText());
-	}
-	else
+	if (! mInFinder)
 	{
 		LLTabContainer* tab = (LLTabContainer*)getParent();
 		tab->setCurrentTabName(mNameEditor->getText());
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 45763dd8a7c..ac1d66157a1 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -120,8 +120,6 @@
 #include "llnotify.h"
 #include "llpanelavatar.h"
 #include "llavatarpropertiesprocessor.h"
-#include "llpaneldirbrowser.h"
-#include "llpaneldirland.h"
 #include "llpanelevent.h"
 #include "llpanelclassified.h"
 #include "llpanelpick.h"
@@ -3265,15 +3263,6 @@ void register_viewer_callbacks(LLMessageSystem* msg)
 	msg->setHandlerFunc("PlacesReply", process_places_reply);
 	msg->setHandlerFunc("GroupNoticesListReply", LLPanelGroupNotices::processGroupNoticesListReply);
 
-	msg->setHandlerFunc("DirPlacesReply", LLPanelDirBrowser::processDirPlacesReply);
-	msg->setHandlerFunc("DirPeopleReply", LLPanelDirBrowser::processDirPeopleReply);
-	msg->setHandlerFunc("DirEventsReply", LLPanelDirBrowser::processDirEventsReply);
-	msg->setHandlerFunc("DirGroupsReply", LLPanelDirBrowser::processDirGroupsReply);
-	//msg->setHandlerFunc("DirPicksReply",  LLPanelDirBrowser::processDirPicksReply);
-	msg->setHandlerFunc("DirClassifiedReply",  LLPanelDirBrowser::processDirClassifiedReply);
-	msg->setHandlerFunc("DirLandReply",   LLPanelDirBrowser::processDirLandReply);
-	//msg->setHandlerFunc("DirPopularReply",LLPanelDirBrowser::processDirPopularReply);
-
 	msg->setHandlerFunc("AvatarPickerReply", LLFloaterAvatarPicker::processAvatarPickerReply);
 
 	msg->setHandlerFunc("MapLayerReply", LLWorldMap::processMapLayerReply);
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index b0930cd86de..4dccdfd7e6c 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -41,7 +41,6 @@
 #include "llviewercontrol.h"
 #include "llfloaterbuycurrency.h"
 #include "llfloaterchat.h"
-#include "llfloaterdirectory.h"		// to spawn search
 #include "llfloaterlagmeter.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterscriptdebug.h"
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index e7a8ad66050..841902f6833 100644
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -36,7 +36,6 @@
 // viewer includes
 #include "llagent.h"			// teleportViaLocation()
 #include "llcommandhandler.h"
-#include "llfloaterdirectory.h"
 #include "llfloaterhelpbrowser.h"
 #include "llfloaterreg.h"
 #include "llfloaterurldisplay.h"
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 9652a7104dd..806085dc243 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -97,7 +97,6 @@
 #include "llfloaterchat.h"
 #include "llfloatercustomize.h"
 #include "llfloaterdaycycle.h"
-#include "llfloaterdirectory.h"
 #include "llfloaterchatterbox.h"
 #include "llfloaterfonttest.h"
 #include "llfloatergodtools.h"
@@ -3513,9 +3512,6 @@ void set_god_level(U8 god_level)
 	gIMMgr->refresh();
 	LLViewerParcelMgr::getInstance()->notifyObservers();
 
-	// Some classifieds change visibility on god mode
-	LLFloaterDirectory::requestClassifieds();
-
 	// God mode changes sim visibility
 	LLWorldMap::getInstance()->reset();
 	LLWorldMap::getInstance()->setCurrentLayer(0);
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 994fbd8475d..6e07d8f2468 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -52,7 +52,6 @@
 #include "llvlmanager.h"
 #include "llagent.h"
 #include "llviewercontrol.h"
-#include "llfloaterdirectory.h"
 #include "llfloatertools.h"
 #include "lldebugview.h"
 #include "llfasttimerview.h"
@@ -813,8 +812,6 @@ void send_stats()
 	S32 window_size = (window_width * window_height) / 1024;
 	misc["string_1"] = llformat("%d", window_size);
 	// misc["string_2"] = 
-// 	misc["int_1"] = LLFloaterDirectory::sOldSearchCount; // Steve: 1.18.6
-// 	misc["int_2"] = LLFloaterDirectory::sNewSearchCount; // Steve: 1.18.6
 // 	misc["int_1"] = LLSD::Integer(gSavedSettings.getU32("RenderQualityPerformance")); // Steve: 1.21
 // 	misc["int_2"] = LLSD::Integer(gFrameStalls); // Steve: 1.21
 
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 30736b1e038..5446a08ebf3 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -47,7 +47,6 @@
 #include "llcallingcard.h"
 #include "llviewercontrol.h"
 #include "llcylinder.h"
-#include "llfloaterdirectory.h"
 #include "llfloatermap.h"
 #include "llfloaterworldmap.h"
 #include "llfocusmgr.h"
diff --git a/indra/newview/macview_Prefix.h b/indra/newview/macview_Prefix.h
index 0fcdf2da4fe..a71362a139e 100644
--- a/indra/newview/macview_Prefix.h
+++ b/indra/newview/macview_Prefix.h
@@ -66,7 +66,6 @@
 #include "llfloaterbuildoptions.h"
 #include "llfloaterchat.h"
 #include "llfloatercustomize.h"
-#include "llfloaterdirectory.h"
 #include "llfloatergroups.h"
 #include "llfloaterworldmap.h"
 #include "llfloatermute.h"
-- 
GitLab