diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-09 21:22:37 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-09 21:22:37 -0500 |
| commit | 21020ef48031a15b751ed5c66dafafda066f5487 (patch) | |
| tree | 380e81f46385c2df37cc84d940b2a6517fbab7a3 /indra/newview | |
| parent | e180c5f2048d163fa5180ef79b7c6d7428f0b65d (diff) | |
EXT-3071 : CTRL+I should bring up either inventorySP or inventory floater
EXT-5239 : Consider removing CTRL+I to spawn multiple inventory windows
BTEST-42 : Can't hide inventory by pressing CTRL+I
CTRL+I will now either open the inventory sidepanel, or close the sidepanel.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 6bf9c993e0..8aae90ec3c 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5630,14 +5630,15 @@ class LLShowSidetrayPanel : public view_listener_t bool handleEvent(const LLSD& userdata) { std::string panel_name = userdata.asString(); - // Open up either the sidepanel or new floater. - if (LLSideTray::getInstance()->isPanelActive(panel_name)) + // Toggle the panel + if (!LLSideTray::getInstance()->isPanelActive(panel_name)) { - LLFloaterInventory::showAgentInventory(); + // LLFloaterInventory::showAgentInventory(); + LLSideTray::getInstance()->showPanel(panel_name, LLSD()); } else { - LLSideTray::getInstance()->showPanel(panel_name, LLSD()); + LLSideTray::getInstance()->collapseSideBar(); } return true; } |