admin/phoenix-firestorm
1
0
Fork 0
mirror of https://github.com/FirestormViewer/phoenix-firestorm.git synced 2026-08-14 00:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix FS Search Webpage not being preloaded

Browse Source
This commit is contained in:
Hecklezz
2026-01-04 03:40:22 +10:00
parent 264524b507
commit 9ee9484dad
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/fsfloatersearch.cpp
+8 -6
View File
@@ -2965,6 +2965,8 @@ bool FSPanelSearchWeb::postBuild()
mWebBrowser = getChild<LLMediaCtrl>("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);