diff options
| author | Ansariel <ansariel.hiller@phoenixviewer.com> | 2025-11-04 18:43:51 +0100 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-11-04 20:43:55 +0200 |
| commit | 5e11448e4fccb56d03eb9a7b18774b8c550683b7 (patch) | |
| tree | 206f9072520e1c8c895f1b364c0e2ed5b35d8ff3 | |
| parent | c7c8d8101bfe2509c9aa3f5ca2fad211c419bd35 (diff) | |
Fix remaining cases of webbrowser-related XUI warnings
| -rw-r--r-- | indra/newview/llfloatersearch.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_search.xml | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index ec9af865cf..9b7a4e5134 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -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 diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 6930165aac..8f229850c0 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -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" }, }; diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index 43c4aa1b9d..8891ebcd87 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -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" |