Merge tag 'Second_Life_Release#f7516a46-2025.08' into 2025.08

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
index 7ee1b88f05..ec9af865cf 100644
--- a/indra/newview/llfloatersearch.cpp
+++ b/indra/newview/llfloatersearch.cpp
@@ -170,6 +170,12 @@ bool LLFloaterSearch::postBuild()
     LLFloaterWebContent::postBuild();
     mWebBrowser = getChild<LLMediaCtrl>("search_contents");
     mWebBrowser->addObserver(this);
+    mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
+
+    // If cookie is there, will set it now, Otherwise will have to wait for login completion
+    // which will also update search instance if it already exists.
+    LLViewerMedia::getInstance()->getOpenIDCookie(mWebBrowser);
+
     getChildView("address")->setEnabled(false);
     getChildView("popexternal")->setEnabled(false);