Anonymous avatar Anonymous committed dd56db2

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.

Comments (0)

Files changed (13)

indra/newview/CMakeLists.txt

     llfloatercolorpicker.cpp
     llfloatercustomize.cpp
     llfloaterdaycycle.cpp
-    llfloaterdirectory.cpp
     llfloaterenvsettings.cpp
     llfloaterfriends.cpp
     llfloaterfonttest.cpp
     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
     llfloatercolorpicker.h
     llfloatercustomize.h
     llfloaterdaycycle.h
-    llfloaterdirectory.h
     llfloaterenvsettings.h
     llfloaterfonttest.h
     llfloaterfriends.h
     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

indra/newview/llagent.cpp

 #include "llfloateractivespeakers.h"
 #include "llfloatercamera.h"
 #include "llfloatercustomize.h"
-#include "llfloaterdirectory.h"
 
 #include "llfloaterland.h"
 #include "llfloatersnapshot.h"
 		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
 	{
 				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
 			{

indra/newview/lleventnotifier.cpp

 #include "llnotify.h"
 #include "lleventinfo.h"
 #include "llfloaterreg.h"
-#include "llfloaterdirectory.h"
 #include "llfloaterworldmap.h"
 #include "llagent.h"
 
 			break;
 		}
 	case 1:
-		gDisplayEventHack = TRUE;
 		LLFloaterReg::showInstance("search", LLSD().insert("panel", "event").insert("id", S32(getEventID())));
 		break;
 	case 2:

indra/newview/llgroupmgr.cpp

 #include "llstatusbar.h"
 #include "lleconomy.h"
 #include "llviewerwindow.h"
-#include "llfloaterdirectory.h"
 #include "llpanelgroup.h"
 #include "llgroupactions.h"
 #include "lluictrlfactory.h"
 		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);
 	}
 }
 
 		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);
 	}
 }
 

indra/newview/llmenucommands.cpp

 #include "llviewercontrol.h"
 #include "llfirstuse.h"
 #include "llfloaterchat.h"
-#include "llfloaterdirectory.h"
 #include "llfloaterworldmap.h"
 #include "lllineeditor.h"
 #include "llnotify.h"

indra/newview/llpanelclassified.cpp

 
 	// 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());

indra/newview/llstartup.cpp

 #include "llnotify.h"
 #include "llpanelavatar.h"
 #include "llavatarpropertiesprocessor.h"
-#include "llpaneldirbrowser.h"
-#include "llpaneldirland.h"
 #include "llpanelevent.h"
 #include "llpanelclassified.h"
 #include "llpanelpick.h"
 	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);

indra/newview/llstatusbar.cpp

 #include "llviewercontrol.h"
 #include "llfloaterbuycurrency.h"
 #include "llfloaterchat.h"
-#include "llfloaterdirectory.h"		// to spawn search
 #include "llfloaterlagmeter.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterscriptdebug.h"

indra/newview/llurldispatcher.cpp

 // viewer includes
 #include "llagent.h"			// teleportViaLocation()
 #include "llcommandhandler.h"
-#include "llfloaterdirectory.h"
 #include "llfloaterhelpbrowser.h"
 #include "llfloaterreg.h"
 #include "llfloaterurldisplay.h"

indra/newview/llviewermenu.cpp

 #include "llfloaterchat.h"
 #include "llfloatercustomize.h"
 #include "llfloaterdaycycle.h"
-#include "llfloaterdirectory.h"
 #include "llfloaterchatterbox.h"
 #include "llfloaterfonttest.h"
 #include "llfloatergodtools.h"
 	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);

indra/newview/llviewerstats.cpp

 #include "llvlmanager.h"
 #include "llagent.h"
 #include "llviewercontrol.h"
-#include "llfloaterdirectory.h"
 #include "llfloatertools.h"
 #include "lldebugview.h"
 #include "llfasttimerview.h"
 	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
 

indra/newview/llworldmapview.cpp

 #include "llcallingcard.h"
 #include "llviewercontrol.h"
 #include "llcylinder.h"
-#include "llfloaterdirectory.h"
 #include "llfloatermap.h"
 #include "llfloaterworldmap.h"
 #include "llfocusmgr.h"

indra/newview/macview_Prefix.h

 #include "llfloaterbuildoptions.h"
 #include "llfloaterchat.h"
 #include "llfloatercustomize.h"
-#include "llfloaterdirectory.h"
 #include "llfloatergroups.h"
 #include "llfloaterworldmap.h"
 #include "llfloatermute.h"
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.