diff options
| author | Callum Prentice <callum@lindenlab.com> | 2025-10-20 10:25:50 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2025-10-20 10:25:50 -0700 |
| commit | c64c16a59ae2220b29ba0ed1f3f22da07e694612 (patch) | |
| tree | 715e1ce1c6049469cffc27bcb0c8b636433539e5 /indra/newview/llstatusbar.cpp | |
| parent | 53d83104522fc683126ba764b3e2101dc7442547 (diff) | |
| parent | 03690724188cb3fef1c2efed0f5626c93096ec2d (diff) | |
Merge branch 'develop' of https://github.com/secondlife/viewer into callum/voice-moderation-2
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 82c959d7f7..2727127633 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -41,6 +41,7 @@ #include "llpanelpresetscamerapulldown.h" #include "llpanelpresetspulldown.h" #include "llpanelvolumepulldown.h" +#include "llfloatermarketplace.h" #include "llfloaterregioninfo.h" #include "llfloaterscriptdebug.h" #include "llhints.h" @@ -523,7 +524,11 @@ void LLStatusBar::onClickBuyCurrency() void LLStatusBar::onClickShop() { - LLFloaterReg::toggleInstanceOrBringToFront("marketplace"); + LLFloaterReg::showInstanceOrBringToFront("marketplace"); + if (LLFloaterMarketplace* marketplace = LLFloaterReg::getTypedInstance<LLFloaterMarketplace>("marketplace")) + { + marketplace->openMarketplace(); + } } void LLStatusBar::onMouseEnterPresetsCamera() |