From b51bb01fb6229561e099772a598fef13bb14b143 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 15 Jan 2016 18:27:19 +0200 Subject: MAINT-6047 FIXED Shop button always opens Marketplace in external browser --- indra/newview/llpaneloutfitedit.cpp | 2 +- indra/newview/llstatusbar.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index 01a22df9e1..8331c152e2 100755 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -850,7 +850,7 @@ void LLPanelOutfitEdit::onShopButtonClicked() url = url_resolver.resolveURL(LLWearableType::WT_NONE, SEX_FEMALE); } - LLWeb::loadURLExternal(url); + LLWeb::loadURL(url); } LLWearableType::EType LLPanelOutfitEdit::getCOFWearablesSelectionType() const diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 2d4b23d892..c839ed48b5 100755 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -163,7 +163,7 @@ BOOL LLStatusBar::postBuild() getChild("buyL")->setCommitCallback( boost::bind(&LLStatusBar::onClickBuyCurrency, this)); - getChild("goShop")->setCommitCallback(boost::bind(&LLWeb::loadURLExternal, gSavedSettings.getString("MarketplaceURL"))); + getChild("goShop")->setCommitCallback(boost::bind(&LLWeb::loadURL, gSavedSettings.getString("MarketplaceURL"), LLStringUtil::null, LLStringUtil::null)); mBoxBalance = getChild("balance"); mBoxBalance->setClickedCallback( &LLStatusBar::onClickBalance, this ); -- cgit v1.2.3