diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index abf0b085cd694b9b964338e29a9d8684a305a260..eccce83c747f815221198eb71841090b45b713f2 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 c67beda361f9acf4a694b88d5487ab84b944bce6..0fa3b1f04df573a0dc1997ba326f5b35ea923ea4 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 2c52cf9565e5341163788cbf8d34345ddfa62606..68a4f317306cfef2d06a6a03386d6122f4b94d11 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 01d0f2296a6dc81406aae8bc9470dcfb144d7f69..0626a5c3d31c98cb6adc7ea0963c02bc73b20d4b 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 f61177d5810dd05eeb00eebdada644896aa0eaa9..8dd09d5ec72f8a0904b6da70f6aec922182cfc3c 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 7eaee92778e003ccfec0b734066cf8b52b6a7e73..a29c9752e6dc6792f219d78ce1916004ef9b2a98 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 45763dd8a7c5ad467c59cf4025bc3a9f2e28fe70..ac1d66157a14173c7ef3c1b5d4ee29199e02c2a9 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 b0930cd86de1c84fa170ab69b020c0482c21ba48..4dccdfd7e6c275ec535a8448e3e16de9f42847e7 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 e7a8ad66050728e32e3387bcc6e9e8f47d4234de..841902f6833dd733a36cd7a31488dad340d1de10 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 9652a7104dd1036f240681cf64c15c6444f90911..806085dc243eede5453e9f87bfda5f2c1e0acd47 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 994fbd8475d962841285a2b4408bc0b955767d74..6e07d8f2468c369a187bb8591e65c6f49fd2882f 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 30736b1e0383f63f6883082cf0ba9812fe5e8b90..5446a08ebf3b2a65a43b08803d5186d9b5b04622 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 0fcdf2da4fe5366de2f5be697ac8e96325150029..a71362a139edd1a87f72de4949b8763f82338f8d 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"