diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-10-03 20:40:15 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-10-03 20:40:15 +0800 |
| commit | fb4d02b735df321cd4a2c8c13eb3b8bd58964868 (patch) | |
| tree | 7f258d26ec389dce2930a3f14f67077526199ac1 /indra/newview/llstatusbar.cpp | |
| parent | 88cdce3f8e30c393d8e1979629162442adeac203 (diff) | |
| parent | 420bc85f97c0c19ffca4b4f26b70d171f7d5761e (diff) | |
Merge tag 'Second_Life_Release#420bc85f-2025.07' into 2025.07
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 9e4abd632a..c456c74f77 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" @@ -551,7 +552,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() |