Skip to content

Commit 20fb5ad

Browse files
RyeMuttRyeMutt
authored
Merge pull request AlchemyViewer#25 from AlchemyViewer/RyeMutt/issue17
Replace directory search with firestorm search and remove legacy profiles
2 parents 0dcc5ce + b20f74a commit 20fb5ad

127 files changed

Lines changed: 9056 additions & 14949 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎indra/llmessage/llclassifiedflags.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ const U8 CLASSIFIED_QUERY_INC_ADULT = 1 << 6;
4747
const U8 CLASSIFIED_QUERY_INC_NEW_VIEWER = (CLASSIFIED_QUERY_INC_PG | CLASSIFIED_QUERY_INC_MATURE | CLASSIFIED_QUERY_INC_ADULT);
4848

4949
const S32 MAX_CLASSIFIEDS = 100;
50-
const S32 MINIMUM_PRICE_FOR_LISTING = 50; // L$
5150

5251
// This function is used in AO viewers to pack old query flags into the request
5352
// so that they can talk to old dataservers properly. When the AO servers are deployed on agni

‎indra/newview/CMakeLists.txt‎

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ set(viewer_SOURCE_FILES
113113
bdfloaterposer.cpp
114114
bdfloaterposecreator.cpp
115115
bdposingmotion.cpp
116+
fsfloatersearch.cpp
116117
fslslpreproc.cpp
117118
fslslpreprocviewer.cpp
118119
gltfscenemanager.cpp
@@ -129,7 +130,6 @@ set(viewer_SOURCE_FILES
129130
llagentbenefits.cpp
130131
llagentcamera.cpp
131132
llagentdata.cpp
132-
llagenthandler.cpp
133133
llagentlanguage.cpp
134134
llagentlistener.cpp
135135
llagentpicksinfo.cpp
@@ -167,7 +167,6 @@ set(viewer_SOURCE_FILES
167167
llchiclet.cpp
168168
llchicletbar.cpp
169169
llclassifiedinfo.cpp
170-
llclassifieditem.cpp
171170
llcofwearables.cpp
172171
llcolorswatch.cpp
173172
llcommanddispatcherlistener.cpp
@@ -264,7 +263,6 @@ set(viewer_SOURCE_FILES
264263
llfloatercreatelandmark.cpp
265264
llfloaterdeleteprefpreset.cpp
266265
llfloaterdestinations.cpp
267-
llfloaterdirectory.cpp
268266
llfloaterdisplayname.cpp
269267
llfloatereditenvironmentbase.cpp
270268
llfloatereditextdaycycle.cpp
@@ -331,14 +329,12 @@ set(viewer_SOURCE_FILES
331329
llfloaterperformance.cpp
332330
llfloaterperms.cpp
333331
llfloaterprofile.cpp
334-
llfloaterprofilelegacy.cpp
335332
llfloaterpreference.cpp
336333
llfloaterpreferencesgraphicsadvanced.cpp
337334
llfloaterpreferenceviewadvanced.cpp
338335
llfloaterpreviewtrash.cpp
339336
llfloaterprofiletexture.cpp
340337
llfloaterprogressview.cpp
341-
llfloaterpublishclassified.cpp
342338
llfloaterregiondebugconsole.cpp
343339
llfloaterregioninfo.cpp
344340
llfloaterreporter.cpp
@@ -370,7 +366,6 @@ set(viewer_SOURCE_FILES
370366
llfloatervoiceeffect.cpp
371367
llfloatervoicevolume.cpp
372368
llfloaterwebcontent.cpp
373-
llfloaterwebprofile.cpp
374369
llfloaterwhitelistentry.cpp
375370
llfloaterwindowsize.cpp
376371
llfloaterworldmap.cpp
@@ -489,7 +484,6 @@ set(viewer_SOURCE_FILES
489484
lloutputmonitorctrl.cpp
490485
llpanelappearancetab.cpp
491486
llpanelavatar.cpp
492-
llpanelavatarlegacy.cpp
493487
llpanelavatartag.cpp
494488
llpanelblockedlist.cpp
495489
llpanelclassified.cpp
@@ -499,7 +493,6 @@ set(viewer_SOURCE_FILES
499493
llpaneleditwearable.cpp
500494
llpanelemojicomplete.cpp
501495
llpanelenvironment.cpp
502-
llpaneleventinfo.cpp
503496
llpanelexperiencelisteditor.cpp
504497
llpanelexperiencelog.cpp
505498
llpanelexperiencepicker.cpp
@@ -539,7 +532,6 @@ set(viewer_SOURCE_FILES
539532
llpanelpeople.cpp
540533
llpanelpeoplemenus.cpp
541534
llpanelpermissions.cpp
542-
llpanelpick.cpp
543535
llpanelplaceinfo.cpp
544536
llpanelplaceprofile.cpp
545537
llpanelplaces.cpp
@@ -548,17 +540,8 @@ set(viewer_SOURCE_FILES
548540
llpanelpresetspulldown.cpp
549541
llpanelprimmediacontrols.cpp
550542
llpanelprofile.cpp
551-
llpanelprofilelegacy.cpp
552543
llpanelprofileclassifieds.cpp
553544
llpanelprofilepicks.cpp
554-
llpanelsearchbase.cpp
555-
llpanelsearchclassifieds.cpp
556-
llpanelsearchevents.cpp
557-
llpanelsearchgroups.cpp
558-
llpanelsearchlandsales.cpp
559-
llpanelsearchpeople.cpp
560-
llpanelsearchplaces.cpp
561-
llpanelsearchweb.cpp
562545
llpanelsnapshot.cpp
563546
llpanelsnapshotinventory.cpp
564547
llpanelsnapshotlocal.cpp
@@ -591,7 +574,6 @@ set(viewer_SOURCE_FILES
591574
llpersistentnotificationstorage.cpp
592575
llphysicsmotion.cpp
593576
llphysicsshapebuilderutil.cpp
594-
llpickitem.cpp
595577
llpipelinelistener.cpp
596578
llplacesinventorybridge.cpp
597579
llplacesinventorypanel.cpp
@@ -608,7 +590,6 @@ set(viewer_SOURCE_FILES
608590
llpreviewtexture.cpp
609591
llproductinforequest.cpp
610592
llprogressview.cpp
611-
llprofileimagepicker.cpp
612593
llrecentpeople.cpp
613594
llreflectionmap.cpp
614595
llreflectionmapmanager.cpp
@@ -859,6 +840,7 @@ set(viewer_HEADER_FILES
859840
bdfloaterposer.h
860841
bdfloaterposecreator.h
861842
bdposingmotion.h
843+
fsfloatersearch.h
862844
fslslpreproc.h
863845
fslslpreprocviewer.h
864846
gltfscenemanager.h
@@ -914,7 +896,6 @@ set(viewer_HEADER_FILES
914896
llchiclet.h
915897
llchicletbar.h
916898
llclassifiedinfo.h
917-
llclassifieditem.h
918899
llcofwearables.h
919900
llcolorswatch.h
920901
llcommanddispatcherlistener.h
@@ -1011,7 +992,6 @@ set(viewer_HEADER_FILES
1011992
llfloatercreatelandmark.h
1012993
llfloaterdeleteprefpreset.h
1013994
llfloaterdestinations.h
1014-
llfloaterdirectory.h
1015995
llfloaterdisplayname.h
1016996
llfloatereditenvironmentbase.h
1017997
llfloatereditextdaycycle.h
@@ -1081,14 +1061,12 @@ set(viewer_HEADER_FILES
10811061
llfloaterperformance.h
10821062
llfloaterperms.h
10831063
llfloaterprofile.h
1084-
llfloaterprofilelegacy.h
10851064
llfloaterpreference.h
10861065
llfloaterpreferencesgraphicsadvanced.h
10871066
llfloaterpreferenceviewadvanced.h
10881067
llfloaterpreviewtrash.h
10891068
llfloaterprofiletexture.h
10901069
llfloaterprogressview.h
1091-
llfloaterpublishclassified.h
10921070
llfloaterregiondebugconsole.h
10931071
llfloaterregioninfo.h
10941072
llfloaterreporter.h
@@ -1120,7 +1098,6 @@ set(viewer_HEADER_FILES
11201098
llfloatervoiceeffect.h
11211099
llfloatervoicevolume.h
11221100
llfloaterwebcontent.h
1123-
llfloaterwebprofile.h
11241101
llfloaterwhitelistentry.h
11251102
llfloaterwindowsize.h
11261103
llfloaterworldmap.h
@@ -1228,7 +1205,6 @@ set(viewer_HEADER_FILES
12281205
lloutputmonitorctrl.h
12291206
llpanelappearancetab.h
12301207
llpanelavatar.h
1231-
llpanelavatarlegacy.h
12321208
llpanelavatartag.h
12331209
llpanelblockedlist.h
12341210
llpanelclassified.h
@@ -1238,7 +1214,6 @@ set(viewer_HEADER_FILES
12381214
llpaneleditwearable.h
12391215
llpanelemojicomplete.h
12401216
llpanelenvironment.h
1241-
llpaneleventinfo.h
12421217
llpanelexperiencelisteditor.h
12431218
llpanelexperiencelog.h
12441219
llpanelexperiencepicker.h
@@ -1279,7 +1254,6 @@ set(viewer_HEADER_FILES
12791254
llpanelpeople.h
12801255
llpanelpeoplemenus.h
12811256
llpanelpermissions.h
1282-
llpanelpick.h
12831257
llpanelplaceinfo.h
12841258
llpanelplaceprofile.h
12851259
llpanelplaces.h
@@ -1288,17 +1262,8 @@ set(viewer_HEADER_FILES
12881262
llpanelpresetspulldown.h
12891263
llpanelprimmediacontrols.h
12901264
llpanelprofile.h
1291-
llpanelprofilelegacy.h
12921265
llpanelprofileclassifieds.h
12931266
llpanelprofilepicks.h
1294-
llpanelsearchbase.h
1295-
llpanelsearchclassifieds.h
1296-
llpanelsearchevents.h
1297-
llpanelsearchgroups.h
1298-
llpanelsearchlandsales.h
1299-
llpanelsearchpeople.h
1300-
llpanelsearchplaces.h
1301-
llpanelsearchweb.h
13021267
llpanelsnapshot.h
13031268
llpanelteleporthistory.h
13041269
llpaneltiptoast.h
@@ -1326,7 +1291,6 @@ set(viewer_HEADER_FILES
13261291
llpersistentnotificationstorage.h
13271292
llphysicsmotion.h
13281293
llphysicsshapebuilderutil.h
1329-
llpickitem.h
13301294
llpipelinelistener.h
13311295
llplacesinventorybridge.h
13321296
llplacesinventorypanel.h
@@ -1342,7 +1306,6 @@ set(viewer_HEADER_FILES
13421306
llpreviewsound.h
13431307
llpreviewtexture.h
13441308
llproductinforequest.h
1345-
llprofileimagepicker.h
13461309
llprogressview.h
13471310
llrecentpeople.h
13481311
llreflectionmap.h

‎indra/newview/alavataractions.cpp‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,8 @@
3636
#include "roles_constants.h"
3737

3838
#include "llagent.h"
39-
#include "llavataractions.h"
40-
#include "llfloaterreg.h"
4139
#include "llfloaterregioninfo.h"
4240
#include "llfloaterreporter.h"
43-
#include "llfloaterwebcontent.h"
4441
#include "llslurl.h"
4542
#include "llviewercontrol.h"
4643
#include "llviewermenu.h"
@@ -856,21 +853,3 @@ bool ALAvatarActions::handleGodKick(const LLSD& notification, const LLSD& respon
856853
}
857854
return false;
858855
}
859-
860-
// Webprofile junk... for posterity!
861-
862-
static void on_avatar_name_show_profile(const LLUUID& agent_id, const LLAvatarName& av_name)
863-
{
864-
LLFloaterWebContent::Params p;
865-
p.url(getProfileURL(av_name.getAccountName())).id(agent_id.asString());
866-
LLFloaterReg::showInstance("webprofile", p);
867-
}
868-
869-
// static
870-
void ALAvatarActions::showWebProfile(const LLUUID& id)
871-
{
872-
if (id.notNull())
873-
{
874-
LLAvatarNameCache::get(id, boost::bind(&on_avatar_name_show_profile, _1, _2));
875-
}
876-
}

‎indra/newview/alavataractions.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ class ALAvatarActions
9494
static void godFreeze(const LLUUID& id);
9595
static void godUnfreeze(const LLUUID& id);
9696

97-
// Webprofile
98-
static void showWebProfile(const LLUUID& id);
99-
10097
private:
10198
static bool handleParcelFreeze(const LLSD& notification, const LLSD& response);
10299
static bool handleParcelEject(const LLSD& notification, const LLSD& response);

‎indra/newview/alviewermenu.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -410,20 +410,20 @@ namespace
410410

411411
class ALToggleLocationBar : public view_listener_t
412412
{
413-
bool handleEvent(const LLSD& userdata) override
414-
{
415-
const U32 val = userdata.asInteger();
416-
gSavedSettings.setU32("NavigationBarStyle", val);
417-
return true;
418-
}
413+
bool handleEvent(const LLSD& userdata) override
414+
{
415+
const U32 val = userdata.asInteger();
416+
gSavedSettings.setU32("NavigationBarStyle", val);
417+
return true;
418+
}
419419
};
420420

421421
class ALCheckLocationBar : public view_listener_t
422422
{
423-
bool handleEvent(const LLSD& userdata) override
424-
{
425-
return userdata.asInteger() == (S32)gSavedSettings.getU32("NavigationBarStyle");
426-
}
423+
bool handleEvent(const LLSD& userdata) override
424+
{
425+
return userdata.asInteger() == (S32)gSavedSettings.getU32("NavigationBarStyle");
426+
}
427427
};
428428
}
429429

@@ -461,5 +461,5 @@ void ALViewerMenu::initialize_menus()
461461
commit.add("View.ToggleCinematicMode", [](LLUICtrl* ctrl, const LLSD& param) { toggle_cinematic_mode(); });
462462

463463
view_listener_t::addMenu(new ALToggleLocationBar(), "ToggleLocationBar");
464-
view_listener_t::addMenu(new ALCheckLocationBar(), "CheckLocationBar");
464+
view_listener_t::addMenu(new ALCheckLocationBar(), "CheckLocationBar");
465465
}

0 commit comments

Comments
 (0)