diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-11-05 12:01:03 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-11-05 12:01:03 +0800 |
| commit | c8df8ed7d077d7e555d76a232b0b77c1665fc030 (patch) | |
| tree | a184c9c7c4b74c513bf9e86c5d1a5af52824d103 /indra/newview/llfloatermarketplace.cpp | |
| parent | 238e0e4e1501c5a82f6798f40e0253848c09645c (diff) | |
| parent | 5e11448e4fccb56d03eb9a7b18774b8c550683b7 (diff) | |
Merge tag 'Second_Life_Release#5e11448e-2025.08' into 2025.08
Diffstat (limited to 'indra/newview/llfloatermarketplace.cpp')
| -rw-r--r-- | indra/newview/llfloatermarketplace.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatermarketplace.cpp b/indra/newview/llfloatermarketplace.cpp index d626786591..7316d7617d 100644 --- a/indra/newview/llfloatermarketplace.cpp +++ b/indra/newview/llfloatermarketplace.cpp @@ -46,9 +46,9 @@ void LLFloaterMarketplace::onClose(bool app_quitting) bool LLFloaterMarketplace::postBuild() { - LLFloaterWebContent::postBuild(); - mWebBrowser = getChild<LLMediaCtrl>("marketplace_contents"); - mWebBrowser->addObserver(this); + if (!LLFloaterWebContent::postBuild()) + return false; + mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL")); std::string url = gSavedSettings.getString("MarketplaceURL"); mWebBrowser->navigateTo(url, HTTP_CONTENT_TEXT_HTML); |