diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2024-01-02 20:55:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-02 20:55:44 +0200 |
| commit | 602a2af309bd66f76bcf4ca10515a10ca57aa5d6 (patch) | |
| tree | f049a966ae0284d04411e3876b1415ab8a9f4044 /indra/newview/llviewermenu.cpp | |
| parent | 1ffa0ce510620c81df03e7c9a2ff6fedb7ce0241 (diff) | |
SL-20759 Ctrl+O should close Avatar floater if Wearing tab is opened
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 553eaaf9b2..0e3527ec36 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -102,6 +102,7 @@ #include "llsceneview.h" #include "llscenemonitor.h" #include "llselectmgr.h" +#include "llsidepanelappearance.h" #include "llspellcheckmenuhandler.h" #include "llstatusbar.h" #include "lltextureview.h" @@ -6651,6 +6652,13 @@ void handle_edit_outfit() void handle_now_wearing() { + LLSidepanelAppearance *panel_appearance = dynamic_cast<LLSidepanelAppearance *>(LLFloaterSidePanelContainer::getPanel("appearance")); + if (panel_appearance && panel_appearance->isInVisibleChain() && panel_appearance->isCOFPanelVisible()) + { + LLFloaterReg::findInstance("appearance")->closeFloater(); + return; + } + LLFloaterSidePanelContainer::showPanel("appearance", LLSD().with("type", "now_wearing")); } |