From b6253a7da4f7f7e265c3b1bc419317f548a81bac Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Thu, 18 Dec 2025 17:48:01 +0100
Subject: [PATCH] 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
 https://github.com/secondlife/viewer/commit/5e11448e4fccb56d03eb9a7b18774b8c550683b7

Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
---
 indra/newview/fsfloatersearch.cpp                            | 4 +++-
 indra/newview/llpanelprofile.cpp                             | 5 +++++
 indra/newview/llviewermedia.cpp                              | 1 +
 .../skins/default/xui/en/panel_fs_search_legacy_web.xml      | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/indra/newview/fsfloatersearch.cpp b/indra/newview/fsfloatersearch.cpp
index 00a0b4325f..53d6e9b8ca 100644
--- a/indra/newview/fsfloatersearch.cpp
+++ b/indra/newview/fsfloatersearch.cpp
@@ -2962,7 +2962,9 @@ FSPanelSearchWeb::FSPanelSearchWeb() : FSSearchPanelBase()
 
 bool FSPanelSearchWeb::postBuild()
 {
-    mWebBrowser = getChild<LLMediaCtrl>("search_contents");
+    mWebBrowser = getChild<LLMediaCtrl>("webbrowser");
+    mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
+    LLViewerMedia::getInstance()->getOpenIDCookie(mWebBrowser);
     return true;
 }
 
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 1413b74400..26c7256bb4 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -2600,6 +2600,11 @@ bool LLPanelProfileWeb::postBuild()
     mWebBrowser->addObserver(this);
     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;
 }
 
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 3e1e077485..0d456900db 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1375,6 +1375,7 @@ void LLViewerMedia::getOpenIDCookieCoro(std::string url)
                         {"search", "webbrowser" },
                         {"marketplace", "webbrowser" },
                         {"destinations", "destination_guide_contents" },
+                        {"avatarinfo", "profile_html" }, // <FS:PP> Load openId cookie in the profile, in feed tab
                     };
                     for (MediaCookieInstance mci : media_cookie_instances)
                     {
diff --git a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_web.xml b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_web.xml
index 6d6e848ae2..5e0e3d0a3b 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_web.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_web.xml
@@ -15,7 +15,7 @@ name="panel_ls_web">
 	 right="-5"
 	 layout="topleft"
 	 follows="all"
-	 name="search_contents"
+	 name="webbrowser"
 	 trusted_content="true"
 	 start_url="about:blank" />
 </panel>
\ No newline at end of file