diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-01-15 18:27:19 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-01-15 18:27:19 +0200 |
| commit | b51bb01fb6229561e099772a598fef13bb14b143 (patch) | |
| tree | e2b4f7f350cca6755ae1b00a545038e8723fea51 /indra | |
| parent | f26f1ca0f4545e695bfb731abd5d8c078de74e1f (diff) | |
MAINT-6047 FIXED Shop button always opens Marketplace in external browser
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llpaneloutfitedit.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llstatusbar.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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<LLUICtrl>("buyL")->setCommitCallback( boost::bind(&LLStatusBar::onClickBuyCurrency, this)); - getChild<LLUICtrl>("goShop")->setCommitCallback(boost::bind(&LLWeb::loadURLExternal, gSavedSettings.getString("MarketplaceURL"))); + getChild<LLUICtrl>("goShop")->setCommitCallback(boost::bind(&LLWeb::loadURL, gSavedSettings.getString("MarketplaceURL"), LLStringUtil::null, LLStringUtil::null)); mBoxBalance = getChild<LLTextBox>("balance"); mBoxBalance->setClickedCallback( &LLStatusBar::onClickBalance, this ); |