Fix remaining cases of webbrowser-related XUI warnings

master
Ansariel 2025-11-04 18:43:51 +01:00 committed by Andrey Kleshchev
parent c7c8d8101b
commit 5e11448e4f
3 changed files with 6 additions and 7 deletions

View File

@ -161,15 +161,14 @@ void LLFloaterSearch::initiateSearch(const LLSD& tokens)
// Naviation to the calculated URL - we know it's HTML so we can
// tell the media system not to bother with the MIME type check.
LLMediaCtrl* search_browser = findChild<LLMediaCtrl>("search_contents");
search_browser->navigateTo(url, HTTP_CONTENT_TEXT_HTML);
mWebBrowser->navigateTo(url, HTTP_CONTENT_TEXT_HTML);
}
bool LLFloaterSearch::postBuild()
{
LLFloaterWebContent::postBuild();
mWebBrowser = getChild<LLMediaCtrl>("search_contents");
mWebBrowser->addObserver(this);
if (!LLFloaterWebContent::postBuild())
return false;
mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
// If cookie is there, will set it now, Otherwise will have to wait for login completion

View File

@ -1364,7 +1364,7 @@ void LLViewerMedia::getOpenIDCookieCoro(std::string url)
std::string browser_name;
};
struct MediaCookieInstance media_cookie_instances[] = {
{"search", "search_contents" },
{"search", "webbrowser" },
{"marketplace", "webbrowser" },
{"destinations", "destination_guide_contents" },
};

View File

@ -170,7 +170,7 @@
layout="topleft"
left="0"
trusted_content="true"
name="search_contents"
name="webbrowser"
top="0"/>
</layout_panel>
<layout_panel name="status_bar"