From 9ee9484dadefd36755d059c0a0ce0bdfed378953 Mon Sep 17 00:00:00 2001 From: Hecklezz Date: Sun, 4 Jan 2026 03:40:22 +1000 Subject: [PATCH] Fix FS Search Webpage not being preloaded --- indra/newview/fsfloatersearch.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/indra/newview/fsfloatersearch.cpp b/indra/newview/fsfloatersearch.cpp index 53d6e9b8ca..4735044440 100644 --- a/indra/newview/fsfloatersearch.cpp +++ b/indra/newview/fsfloatersearch.cpp @@ -2965,6 +2965,8 @@ bool FSPanelSearchWeb::postBuild() mWebBrowser = getChild("webbrowser"); mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL")); LLViewerMedia::getInstance()->getOpenIDCookie(mWebBrowser); + loadURL(SearchQuery()); + return true; } @@ -3042,12 +3044,16 @@ void FSPanelSearchWeb::loadURL(const SearchQuery &p) // Get the search URL and expand all of the substitutions // (also adds things like [LANGUAGE], [VERSION], [OS], etc.) - std::string url; + std::string url = LFSimFeatureHandler::instance().searchURL(); + if (url.empty()) + { + url = LLGridManager::getInstance()->isInSecondLife() ? gSavedSettings.getString("SearchURL") : gSavedSettings.getString("SearchURLOpenSim"); + } // add the maturity and category variables to the new Second Life search URL if (LLGridManager::getInstance()->isInSecondLife()) { - url = LFSimFeatureHandler::instance().searchURL() + "&maturity=" + maturity + "&" + mCategoryPaths[p.category()].asString(); + url += "&maturity=" + maturity + "&" + mCategoryPaths[p.category()].asString(); } // for OpenSim, do the same as in earlier versions else @@ -3057,10 +3063,6 @@ void FSPanelSearchWeb::loadURL(const SearchQuery &p) { url = debug_url; } - else - { - url = LFSimFeatureHandler::instance().searchURL(); - } } url = LLWeb::expandURLSubstitutions(url, subs);