Merge tag 'Second_Life_Release#f7516a46-2025.08' into 2025.082025.08

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/newview/llfloatermarketplace.cpp b/indra/newview/llfloatermarketplace.cpp
index 4abea64302..d626786591 100644
--- a/indra/newview/llfloatermarketplace.cpp
+++ b/indra/newview/llfloatermarketplace.cpp
@@ -49,6 +49,13 @@ bool LLFloaterMarketplace::postBuild()
     LLFloaterWebContent::postBuild();
     mWebBrowser = getChild<LLMediaCtrl>("marketplace_contents");
     mWebBrowser->addObserver(this);
+    mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
+    std::string url = gSavedSettings.getString("MarketplaceURL");
+    mWebBrowser->navigateTo(url, HTTP_CONTENT_TEXT_HTML);
+
+    // If cookie is there, will set it now, Otherwise will have to wait for login completion
+    // which will also update marketplace instance if it already exists.
+    LLViewerMedia::getInstance()->getOpenIDCookie(mWebBrowser);
 
     return true;
 }