diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-10-10 17:17:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-10 17:17:25 -0400 |
| commit | 2cdcd336ba63702cbf9919bebb279292edf9ba0e (patch) | |
| tree | 9ea43c81fd431397648d9a1292f94519a41b797a /indra/newview/llstatusbar.cpp | |
| parent | 6efde0ba83b6ce2f2735f0c4a532cc405b8a3a8d (diff) | |
| parent | b277cc6a8fd2a48ed3ba6498734d9fae209d181e (diff) | |
Merge pull request #4783 from RyeMutt/rye/convexdecomp
Introduce initial VHACD based llconvexdecomposition library
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() |