From d294d568d1c97650bba4c388c8a7eab5a5c49c94 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 21 Oct 2025 22:05:07 +0300 Subject: #4411 WIP initial restoring of Legacy Search --- indra/newview/llpaneldirpeople.cpp | 106 +++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 indra/newview/llpaneldirpeople.cpp (limited to 'indra/newview/llpaneldirpeople.cpp') diff --git a/indra/newview/llpaneldirpeople.cpp b/indra/newview/llpaneldirpeople.cpp new file mode 100644 index 0000000000..75226f3a09 --- /dev/null +++ b/indra/newview/llpaneldirpeople.cpp @@ -0,0 +1,106 @@ +/** + * @file llpaneldirpeople.cpp + * @brief People panel in the legacy Search directory. + * + * $LicenseInfo:firstyear=2025&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2025, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "llpaneldirpeople.h" +#include "llviewerwindow.h" +#include "llsearcheditor.h" + +// viewer project includes +#include "llqueryflags.h" +#include "llnotificationsutil.h" + +static LLPanelInjector t_panel_dir_people("panel_dir_people"); + +LLPanelDirPeople::LLPanelDirPeople() +: LLPanelDirBrowser() +{ + mMinSearchChars = 3; +} + +bool LLPanelDirPeople::postBuild() +{ + LLPanelDirBrowser::postBuild(); + + //getChild("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL); + + childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this); + //childDisable("Search"); + setDefaultBtn( "Search" ); + + return true; +} + +LLPanelDirPeople::~LLPanelDirPeople() +{ +} + +// virtual +void LLPanelDirPeople::performQuery() +{ + if (childGetValue("name").asString().length() < mMinSearchChars) + { + return; + } + + // filter short words out of the query string + // and indidate if we did have to filter it + // The shortest username is 2 characters long. + const S32 SHORTEST_WORD_LEN = 2; + bool query_was_filtered = false; + std::string query_string = LLPanelDirBrowser::filterShortWords( + childGetValue("name").asString(), + SHORTEST_WORD_LEN, + query_was_filtered ); + + // possible we threw away all the short words in the query so check length + if ( query_string.length() < mMinSearchChars ) + { + LLNotificationsUtil::add("SeachFilteredOnShortWordsEmpty"); + return; + }; + + // if we filtered something out, display a popup + if ( query_was_filtered ) + { + LLSD args; + args["FINALQUERY"] = query_string; + LLNotificationsUtil::add("SeachFilteredOnShortWords", args); + }; + + setupNewSearch(); + + U32 scope = DFQ_PEOPLE; + + // send the message + sendDirFindQuery( + gMessageSystem, + mSearchID, + query_string, + scope, + mSearchStart); +} -- cgit v1.3 From 8bcbb33cf2bfed9ab929170aeedb7f6ea391b06f Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 27 Oct 2025 18:44:24 +0200 Subject: Fix indentation and trailing-whitespace --- indra/newview/llfloaterdirectory.h | 2 +- indra/newview/llpaneldirbrowser.cpp | 20 ++++++------- indra/newview/llpaneldirbrowser.h | 8 ++--- indra/newview/llpaneldirclassified.cpp | 2 +- indra/newview/llpaneldirland.cpp | 54 +++++++++++++++------------------- indra/newview/llpaneldirland.h | 46 +++++++++++++---------------- indra/newview/llpaneldirpeople.cpp | 6 ++-- indra/newview/llpaneldirplaces.cpp | 4 +-- indra/newview/llpaneldirweb.cpp | 1 - 9 files changed, 64 insertions(+), 79 deletions(-) (limited to 'indra/newview/llpaneldirpeople.cpp') diff --git a/indra/newview/llfloaterdirectory.h b/indra/newview/llfloaterdirectory.h index c7dd243007..a5f39c895d 100644 --- a/indra/newview/llfloaterdirectory.h +++ b/indra/newview/llfloaterdirectory.h @@ -57,7 +57,7 @@ class LLPanelClassifiedInfo; // Floater to find people, places, things class LLFloaterDirectory : public LLFloater { -public: +public: LLFloaterDirectory(const std::string& name); /*virtual*/ ~LLFloaterDirectory(); diff --git a/indra/newview/llpaneldirbrowser.cpp b/indra/newview/llpaneldirbrowser.cpp index ff431c6034..5431a3af98 100644 --- a/indra/newview/llpaneldirbrowser.cpp +++ b/indra/newview/llpaneldirbrowser.cpp @@ -171,13 +171,13 @@ void LLPanelDirBrowser::updateResultCount() if (!mHaveSearchResults) result_count = 0; - if (mNextPageBtn && mNextPageBtn->getVisible()) + if (mNextPageBtn && mNextPageBtn->getVisible()) { // Item count be off by a few if bogus items sent from database // Just use the number of results per page. JC result_text = llformat(">%d found", mResultsPerPage); } - else + else { result_text = llformat("%d found", result_count); } @@ -203,17 +203,17 @@ void LLPanelDirBrowser::updateResultCount() std::string LLPanelDirBrowser::filterShortWords(const std::string source_string, int shortest_word_length, bool& was_filtered) { // degenerate case - if ( source_string.length() < 1 ) + if ( source_string.length() < 1 ) return ""; std::stringstream codec( source_string ); std::string each_word; std::vector< std::string > all_words; - + while( codec >> each_word ) all_words.push_back( each_word ); - std::ostringstream dest_string( "" ); + std::ostringstream dest_string( "" ); was_filtered = false; @@ -319,7 +319,6 @@ void LLPanelDirBrowser::onCommitList(LLUICtrl* ctrl, void* data) void LLPanelDirBrowser::showDetailPanel(S32 type, LLSD id) { - switch(type) { case AVATAR_CODE: @@ -371,7 +370,6 @@ void LLPanelDirBrowser::showDetailPanel(S32 type, LLSD id) } break; } - } @@ -399,7 +397,7 @@ void LLPanelDirBrowser::processDirPeopleReply(LLMessageSystem *msg, void**) msg->getUUIDFast(_PREHASH_QueryData,_PREHASH_QueryID, query_id); LLPanelDirBrowser* self = get_if_there(gDirBrowserInstances, query_id, (LLPanelDirBrowser*)NULL); - if (!self) + if (!self) { // data from an old query return; @@ -493,7 +491,7 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**) } LLPanelDirBrowser* self = get_if_there(gDirBrowserInstances, query_id, (LLPanelDirBrowser*)NULL); - if (!self) + if (!self) { // data from an old query return; @@ -877,7 +875,7 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**) msg->getUUID("QueryData", "QueryID", query_id ); LLPanelDirBrowser* browser = get_if_there(gDirBrowserInstances, query_id, (LLPanelDirBrowser*)NULL); - if (!browser) + if (!browser) { // data from an old query return; @@ -1149,7 +1147,7 @@ void LLPanelDirBrowser::onVisibilityChange(bool new_visibility) S32 LLPanelDirBrowser::showNextButton(S32 rows) { - // HACK: This hack doesn't work for llpaneldirfind (ALL) + // HACK: This hack doesn't work for llpaneldirfind (ALL) // because other data is being returned as well. if ( getName() != "find_all_old_panel") { diff --git a/indra/newview/llpaneldirbrowser.h b/indra/newview/llpaneldirbrowser.h index 8954f397e7..0e82f7e423 100644 --- a/indra/newview/llpaneldirbrowser.h +++ b/indra/newview/llpaneldirbrowser.h @@ -148,10 +148,10 @@ const S32 PLACE_CODE = 1; //const S32 OFFLINE_CODE = 3; const S32 AVATAR_CODE = 3; const S32 GROUP_CODE = 4; -const S32 CLASSIFIED_CODE = 5; -const S32 FOR_SALE_CODE = 6; // for sale place -const S32 AUCTION_CODE = 7; // for auction place -const S32 POPULAR_CODE = 8; // popular by dwell +const S32 CLASSIFIED_CODE = 5; +const S32 FOR_SALE_CODE = 6; // for sale place +const S32 AUCTION_CODE = 7; // for auction place +const S32 POPULAR_CODE = 8; // popular by dwell // mask values for search flags const S32 SEARCH_NONE = 0; // should try not to send this to the search engine diff --git a/indra/newview/llpaneldirclassified.cpp b/indra/newview/llpaneldirclassified.cpp index cedd91e1bd..f055e6f05a 100644 --- a/indra/newview/llpaneldirclassified.cpp +++ b/indra/newview/llpaneldirclassified.cpp @@ -96,7 +96,7 @@ void LLPanelDirClassified::performQuery() inc_mature && gAgent.canAccessMature(), inc_adult && gAgent.canAccessAdult()); U32 category = childGetValue("Category").asInteger(); - + msg->nextBlockFast(_PREHASH_QueryData); msg->addUUIDFast(_PREHASH_QueryID, mSearchID ); msg->addStringFast(_PREHASH_QueryText, childGetValue("name").asString()); diff --git a/indra/newview/llpaneldirland.cpp b/indra/newview/llpaneldirland.cpp index ae1dfae092..c4809fc2a6 100644 --- a/indra/newview/llpaneldirland.cpp +++ b/indra/newview/llpaneldirland.cpp @@ -1,32 +1,26 @@ -/** +/** * @file llpaneldirland.cpp - * @brief Land For Sale and Auction in the Find directory. + * @brief Land panel in the legacy Search directory. * - * $LicenseInfo:firstyear=2001&license=viewergpl$ - * - * Copyright (c) 2001-2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2025&license=viewerlgpl$ * Second Life Viewer Source Code - * The source code in this file ("Source Code") is provided by Linden Lab - * to you under the terms of the GNU General Public License, version 2.0 - * ("GPL"), unless you have obtained a separate licensing agreement - * ("Other License"), formally executed by you and Linden Lab. Terms of - * the GPL can be found in doc/GPL-license.txt in this distribution, or - * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 - * - * There are special exceptions to the terms and conditions of the GPL as - * it is applied to this Source Code. View the full text of the exception - * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at - * http://secondlifegrid.net/programs/open_source/licensing/flossexception - * - * By copying, modifying or distributing this software, you acknowledge - * that you have read and understood your obligations described above, - * and agree to abide by those obligations. - * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * Copyright (C) 2025, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -122,7 +116,7 @@ void LLPanelDirLand::onClickSort() performQuery(); } -// static +// static void LLPanelDirLand::onCommitPrice(LLUICtrl* ctrl, void* data) { LLPanelDirLand* self = (LLPanelDirLand*)data; @@ -132,7 +126,7 @@ void LLPanelDirLand::onCommitPrice(LLUICtrl* ctrl, void* data) self->childSetEnabled("priceedit", check->get()); } -// static +// static void LLPanelDirLand::onCommitArea(LLUICtrl* ctrl, void* data) { LLPanelDirLand* self = (LLPanelDirLand*)data; @@ -187,7 +181,7 @@ void LLPanelDirLand::performQuery() { query_flags |= DFQ_INC_ADULT; } - + // Add old flags in case we are talking to an old dataserver if (inc_pg && !inc_mature) { @@ -196,7 +190,7 @@ void LLPanelDirLand::performQuery() if (!inc_pg && inc_mature) { - query_flags |= DFQ_MATURE_SIMS_ONLY; + query_flags |= DFQ_MATURE_SIMS_ONLY; } LLScrollListCtrl* list = getChild("results"); diff --git a/indra/newview/llpaneldirland.h b/indra/newview/llpaneldirland.h index 1d3168f19f..197c4cdc3d 100644 --- a/indra/newview/llpaneldirland.h +++ b/indra/newview/llpaneldirland.h @@ -1,32 +1,26 @@ -/** +/** * @file llpaneldirland.h - * @brief Land For Sale and Auction in the Find directory. + * @brief Land panel in the legacy Search directory. * - * $LicenseInfo:firstyear=2001&license=viewergpl$ - * - * Copyright (c) 2001-2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2025&license=viewerlgpl$ * Second Life Viewer Source Code - * The source code in this file ("Source Code") is provided by Linden Lab - * to you under the terms of the GNU General Public License, version 2.0 - * ("GPL"), unless you have obtained a separate licensing agreement - * ("Other License"), formally executed by you and Linden Lab. Terms of - * the GPL can be found in doc/GPL-license.txt in this distribution, or - * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 - * - * There are special exceptions to the terms and conditions of the GPL as - * it is applied to this Source Code. View the full text of the exception - * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at - * http://secondlifegrid.net/programs/open_source/licensing/flossexception - * - * By copying, modifying or distributing this software, you acknowledge - * that you have read and understood your obligations described above, - * and agree to abide by those obligations. - * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * Copyright (C) 2025, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ diff --git a/indra/newview/llpaneldirpeople.cpp b/indra/newview/llpaneldirpeople.cpp index 75226f3a09..976b179fb8 100644 --- a/indra/newview/llpaneldirpeople.cpp +++ b/indra/newview/llpaneldirpeople.cpp @@ -72,9 +72,9 @@ void LLPanelDirPeople::performQuery() // The shortest username is 2 characters long. const S32 SHORTEST_WORD_LEN = 2; bool query_was_filtered = false; - std::string query_string = LLPanelDirBrowser::filterShortWords( - childGetValue("name").asString(), - SHORTEST_WORD_LEN, + std::string query_string = LLPanelDirBrowser::filterShortWords( + childGetValue("name").asString(), + SHORTEST_WORD_LEN, query_was_filtered ); // possible we threw away all the short words in the query so check length diff --git a/indra/newview/llpaneldirplaces.cpp b/indra/newview/llpaneldirplaces.cpp index 3f1fa2ab05..57d9d556b6 100644 --- a/indra/newview/llpaneldirplaces.cpp +++ b/indra/newview/llpaneldirplaces.cpp @@ -140,9 +140,9 @@ void LLPanelDirPlaces::performQuery() if (0x0 == flags) { LLNotificationsUtil::add("NoContentToSearch"); - return; + return; } - + queryCore(query_string, category, flags); } diff --git a/indra/newview/llpaneldirweb.cpp b/indra/newview/llpaneldirweb.cpp index ec0635a407..9e76bb81a6 100644 --- a/indra/newview/llpaneldirweb.cpp +++ b/indra/newview/llpaneldirweb.cpp @@ -107,7 +107,6 @@ void LLPanelDirWeb::navigateToDefaultPage() maturity = "gm"; } subs["MATURITY"] = maturity; - url = LLWeb::expandURLSubstitutions(url, subs); mWebBrowser->navigateTo(url, HTTP_CONTENT_TEXT_HTML); } -- cgit v1.3 From 84b2861b9e99c5099ee82a12a566119b3de9417e Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 27 Oct 2025 23:26:08 +0200 Subject: Mac build fix and clean up --- indra/newview/llfloaterdirectory.cpp | 1 - indra/newview/llfloaterdirectory.h | 1 - indra/newview/llpaneldirbrowser.cpp | 2 +- indra/newview/llpaneldirbrowser.h | 7 +++++-- indra/newview/llpaneldirclassified.cpp | 1 + indra/newview/llpaneldirevents.cpp | 20 +++++++++++--------- indra/newview/llpaneldirevents.h | 2 +- indra/newview/llpaneldirgroups.cpp | 1 - indra/newview/llpaneldirpeople.cpp | 1 - indra/newview/llpaneldirplaces.cpp | 2 +- indra/newview/llpaneldirplaces.h | 2 +- indra/newview/llpaneldirweb.h | 6 +++--- indra/newview/llviewerfloaterreg.cpp | 6 ++++-- .../skins/default/xui/en/panel_dir_events.xml | 4 ++-- 14 files changed, 30 insertions(+), 26 deletions(-) (limited to 'indra/newview/llpaneldirpeople.cpp') diff --git a/indra/newview/llfloaterdirectory.cpp b/indra/newview/llfloaterdirectory.cpp index 35f0f7ef5a..e062ca7ac6 100644 --- a/indra/newview/llfloaterdirectory.cpp +++ b/indra/newview/llfloaterdirectory.cpp @@ -46,7 +46,6 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name) : LLFloater(name), - mMinimizing(false), mPanelAvatarp(nullptr), mPanelGroupp(nullptr), mPanelPlacep(nullptr), diff --git a/indra/newview/llfloaterdirectory.h b/indra/newview/llfloaterdirectory.h index a5f39c895d..de788443be 100644 --- a/indra/newview/llfloaterdirectory.h +++ b/indra/newview/llfloaterdirectory.h @@ -73,7 +73,6 @@ public: LLPanelClassifiedInfo* mPanelClassifiedp; private: - bool mMinimizing; // HACK: see reshape() for details static LLFloaterDirectory *sInstance; }; diff --git a/indra/newview/llpaneldirbrowser.cpp b/indra/newview/llpaneldirbrowser.cpp index 5431a3af98..8468520c11 100644 --- a/indra/newview/llpaneldirbrowser.cpp +++ b/indra/newview/llpaneldirbrowser.cpp @@ -70,7 +70,7 @@ LLPanelDirBrowser::LLPanelDirBrowser() mCurrentSortColumn("name"), mCurrentSortAscending(true), mSearchStart(0), - mResultsPerPage(100), + mResultsPerPage(RESULTS_PER_PAGE_DEFAULT), mResultsReceived(0), mMinSearchChars(1), mResultsContents(), diff --git a/indra/newview/llpaneldirbrowser.h b/indra/newview/llpaneldirbrowser.h index 0e82f7e423..cb947f8507 100644 --- a/indra/newview/llpaneldirbrowser.h +++ b/indra/newview/llpaneldirbrowser.h @@ -45,9 +45,9 @@ public: void setFloaterDirectory(LLFloaterDirectory* floater) { mFloaterDirectory = floater; } // Use to get periodic updates. - virtual void draw(); + void draw() override; - virtual void onVisibilityChange(bool curVisibilityIn); + void onVisibilityChange(bool curVisibilityIn) override; // Redo your search for the prev/next page of results virtual void prevPage(); @@ -139,6 +139,9 @@ protected: LLButton* mNextPageBtn; }; +constexpr S32 RESULTS_PER_PAGE_DEFAULT = 100; +constexpr S32 RESULTS_PER_PAGE_EVENTS = 200; + // Codes used for sorting by type. const S32 INVALID_CODE = -1; const S32 EVENT_CODE = 0; diff --git a/indra/newview/llpaneldirclassified.cpp b/indra/newview/llpaneldirclassified.cpp index f055e6f05a..ca625b956b 100644 --- a/indra/newview/llpaneldirclassified.cpp +++ b/indra/newview/llpaneldirclassified.cpp @@ -62,6 +62,7 @@ bool LLPanelDirClassified::postBuild() LLPanelDirBrowser::postBuild(); childSetAction("Search", onClickSearchCore, this); + setDefaultBtn("Search"); return true; } diff --git a/indra/newview/llpaneldirevents.cpp b/indra/newview/llpaneldirevents.cpp index 868ccc4c33..63eba04296 100644 --- a/indra/newview/llpaneldirevents.cpp +++ b/indra/newview/llpaneldirevents.cpp @@ -45,12 +45,14 @@ static LLPanelInjector t_panel_dir_events("panel_dir_events"); +constexpr S32 DAY_TO_SEC = 24 * 60 * 60; + LLPanelDirEvents::LLPanelDirEvents() : LLPanelDirBrowser(), mDay(0) { // more results per page for this - mResultsPerPage = 200; + mResultsPerPage = RESULTS_PER_PAGE_EVENTS; } bool LLPanelDirEvents::postBuild() @@ -59,8 +61,8 @@ bool LLPanelDirEvents::postBuild() childSetCommitCallback("date_mode", onDateModeCallback, this); - childSetAction("<<", onBackBtn, this); - childSetAction(">>", onForwardBtn, this); + childSetAction("back_btn", onBackBtn, this); + childSetAction("forward_btn", onForwardBtn, this); childSetCommitCallback("mature", onCommitMature, this); @@ -88,7 +90,7 @@ void LLPanelDirEvents::setDay(S32 day) time_t utc_time = time_corrected(); // Correct for offset - utc_time += day * 24 * 60 * 60; + utc_time += day * DAY_TO_SEC; // There's only one internal tm buffer. struct tm* internal_time; @@ -120,7 +122,7 @@ void LLPanelDirEvents::performQueryOrDelete(U32 event_id) time_t utc_time = time_corrected(); // Correct for offset - utc_time += relative_day * 24 * 60 * 60; + utc_time += relative_day * DAY_TO_SEC; // There's only one internal tm buffer. struct tm* internal_time; @@ -208,13 +210,13 @@ void LLPanelDirEvents::onDateModeCallback(LLUICtrl* ctrl, void *data) LLPanelDirEvents* self = (LLPanelDirEvents*)data; if (self->childGetValue("date_mode").asString() == "date") { - self->childEnable(">>"); - self->childEnable("<<"); + self->childEnable("forward_btn"); + self->childEnable("back_btn"); } else { - self->childDisable(">>"); - self->childDisable("<<"); + self->childDisable("forward_btn"); + self->childDisable("back_btn"); } } diff --git a/indra/newview/llpaneldirevents.h b/indra/newview/llpaneldirevents.h index 6a86826749..596abc5f0e 100644 --- a/indra/newview/llpaneldirevents.h +++ b/indra/newview/llpaneldirevents.h @@ -40,7 +40,7 @@ public: bool postBuild() override; - /*virtual*/ void performQuery(); + /*virtual*/ void performQuery() override; void performQueryOrDelete(U32 event_id); diff --git a/indra/newview/llpaneldirgroups.cpp b/indra/newview/llpaneldirgroups.cpp index 9a8f418a65..992d92091c 100644 --- a/indra/newview/llpaneldirgroups.cpp +++ b/indra/newview/llpaneldirgroups.cpp @@ -49,7 +49,6 @@ bool LLPanelDirGroups::postBuild() //getChild("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL); childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this); - //childDisable("Search"); setDefaultBtn( "Search" ); return true; diff --git a/indra/newview/llpaneldirpeople.cpp b/indra/newview/llpaneldirpeople.cpp index 976b179fb8..6a55e3bc7c 100644 --- a/indra/newview/llpaneldirpeople.cpp +++ b/indra/newview/llpaneldirpeople.cpp @@ -49,7 +49,6 @@ bool LLPanelDirPeople::postBuild() //getChild("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL); childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this); - //childDisable("Search"); setDefaultBtn( "Search" ); return true; diff --git a/indra/newview/llpaneldirplaces.cpp b/indra/newview/llpaneldirplaces.cpp index 57d9d556b6..2d54566038 100644 --- a/indra/newview/llpaneldirplaces.cpp +++ b/indra/newview/llpaneldirplaces.cpp @@ -60,7 +60,7 @@ bool LLPanelDirPlaces::postBuild() //getChild("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL); childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this); - //childDisable("Search"); + setDefaultBtn("Search"); mCurrentSortColumn = "dwell"; mCurrentSortAscending = false; diff --git a/indra/newview/llpaneldirplaces.h b/indra/newview/llpaneldirplaces.h index 5d91d75810..069414ebf5 100644 --- a/indra/newview/llpaneldirplaces.h +++ b/indra/newview/llpaneldirplaces.h @@ -39,7 +39,7 @@ public: bool postBuild() override; - void performQuery(); + void performQuery() override; // Initially fill in some data for the panel. void initialQuery(); diff --git a/indra/newview/llpaneldirweb.h b/indra/newview/llpaneldirweb.h index 0287c5006c..db7bdc4a6a 100644 --- a/indra/newview/llpaneldirweb.h +++ b/indra/newview/llpaneldirweb.h @@ -41,10 +41,10 @@ public: ~LLPanelDirWeb(); bool postBuild() override; - void onVisibilityChange(bool new_visibility); - void draw(); + void onVisibilityChange(bool new_visibility) override; + void draw() override; - void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event); + void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override; void navigateToDefaultPage(); diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index a17c2f71df..ab5235c3ad 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -232,7 +232,8 @@ public: "upload_model", "upload_script", "upload_sound", - "bulk_upload" + "bulk_upload", + "legacy_search" }; return std::find(blacklist_clicked.begin(), blacklist_clicked.end(), fl_name) == blacklist_clicked.end(); } @@ -284,7 +285,8 @@ public: "upload_script", "upload_sound", "bulk_upload", - "slapp_test" + "slapp_test", + "legacy_search" }; return std::find(blacklist_untrusted.begin(), blacklist_untrusted.end(), fl_name) == blacklist_untrusted.end(); } diff --git a/indra/newview/skins/default/xui/en/panel_dir_events.xml b/indra/newview/skins/default/xui/en/panel_dir_events.xml index ffbbbeb251..b194ce5646 100644 --- a/indra/newview/skins/default/xui/en/panel_dir_events.xml +++ b/indra/newview/skins/default/xui/en/panel_dir_events.xml @@ -261,7 +261,7 @@ label_selected="<<" left_delta="54" mouse_opaque="true" - name="<<" + name="back_btn" tool_tip="Go back a day" width="20" /> -- cgit v1.3