diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2009-11-23 23:03:08 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2009-11-23 23:03:08 +0200 |
| commit | 9135bb7b0f7d194b8ffc0db3374a7e882fe39a94 (patch) | |
| tree | 3e6c51faf822fbc4f6e897250c0e28e2e59b21b9 /indra/newview | |
| parent | 3119468d06f38cc4a5b9535fc8eeb943d794dd2e (diff) | |
Implemented normal task EXT-2739 (Ctrl-I should open Inventory side panel,
Ctrl-Shift-I should open Inventory floater).
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 11 |
2 files changed, 21 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index c67af994a4..625b816125 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5678,6 +5678,16 @@ class LLFloaterVisible : public view_listener_t } }; +class LLShowSidetrayPanel : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + std::string panel_name = userdata.asString(); + LLSideTray::getInstance()->showPanel(panel_name, LLSD()); + return true; + } +}; + bool callback_show_url(const LLSD& notification, const LLSD& response) { S32 option = LLNotification::getSelectedOption(notification, response); @@ -8039,6 +8049,7 @@ void initialize_menus() visible.add("Object.VisibleEdit", boost::bind(&enable_object_edit)); view_listener_t::addMenu(new LLFloaterVisible(), "FloaterVisible"); + view_listener_t::addMenu(new LLShowSidetrayPanel(), "ShowSidetrayPanel"); view_listener_t::addMenu(new LLSomethingSelected(), "SomethingSelected"); view_listener_t::addMenu(new LLSomethingSelectedNoHUD(), "SomethingSelectedNoHUD"); view_listener_t::addMenu(new LLEditableSelected(), "EditableSelected"); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 8ab5fb1659..e19e11a1b8 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -59,7 +59,7 @@ label="My Inventory" layout="topleft" name="Inventory" - shortcut="control|I"> + shortcut="control|shift|I"> <menu_item_check.on_check function="Floater.Visible" parameter="inventory" /> @@ -68,6 +68,15 @@ parameter="inventory" /> </menu_item_check> <menu_item_call + label="Show Sidetray Inventory" + name="ShowSidetrayInventory" + shortcut="control|I" + visible="false"> + <menu_item_call.on_click + function="ShowSidetrayPanel" + parameter="sidepanel_inventory" /> + </menu_item_call> + <menu_item_call label="My Gestures" layout="topleft" name="Gestures" |