Align the web browser search element name in the FS search floater with the SL viewer one

This squashes 'LLView::getChild : Making dummy class LLMediaCtrl named "webbrowser" in floater_fs_search'
See 5e11448e4f

Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
master
PanteraPolnocy 2025-12-18 17:48:01 +01:00
parent 215412e28a
commit b6253a7da4
4 changed files with 10 additions and 2 deletions

View File

@ -2962,7 +2962,9 @@ FSPanelSearchWeb::FSPanelSearchWeb() : FSSearchPanelBase()
bool FSPanelSearchWeb::postBuild() bool FSPanelSearchWeb::postBuild()
{ {
mWebBrowser = getChild<LLMediaCtrl>("search_contents"); mWebBrowser = getChild<LLMediaCtrl>("webbrowser");
mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
LLViewerMedia::getInstance()->getOpenIDCookie(mWebBrowser);
return true; return true;
} }

View File

@ -2600,6 +2600,11 @@ bool LLPanelProfileWeb::postBuild()
mWebBrowser->addObserver(this); mWebBrowser->addObserver(this);
mWebBrowser->setHomePageUrl("about:blank"); mWebBrowser->setHomePageUrl("about:blank");
// <FS:PP> Load cookies in the profile, in feed tab
mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
LLViewerMedia::getInstance()->getOpenIDCookie(mWebBrowser);
// </FS:PP>
return true; return true;
} }

View File

@ -1375,6 +1375,7 @@ void LLViewerMedia::getOpenIDCookieCoro(std::string url)
{"search", "webbrowser" }, {"search", "webbrowser" },
{"marketplace", "webbrowser" }, {"marketplace", "webbrowser" },
{"destinations", "destination_guide_contents" }, {"destinations", "destination_guide_contents" },
{"avatarinfo", "profile_html" }, // <FS:PP> Load openId cookie in the profile, in feed tab
}; };
for (MediaCookieInstance mci : media_cookie_instances) for (MediaCookieInstance mci : media_cookie_instances)
{ {

View File

@ -15,7 +15,7 @@ name="panel_ls_web">
right="-5" right="-5"
layout="topleft" layout="topleft"
follows="all" follows="all"
name="search_contents" name="webbrowser"
trusted_content="true" trusted_content="true"
start_url="about:blank" /> start_url="about:blank" />
</panel> </panel>