diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-11 16:33:56 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-11 16:33:56 -0500 |
| commit | 35d43f25620a6eb3878fc744a22398aac29d1e20 (patch) | |
| tree | d718145f23ea58343e8701ce23e1ebf56f7349ee /indra/newview/skins | |
| parent | e612015500b9f17aab3d3c48f8717d9c0f0ae1ca (diff) | |
EXT-5105 Incorrect keyboard shortcut for Inventory in main menu
EXT-5334 CTRL+SHIFT+I now brings up InventorySP instead of InventoryFloater
Fixed a regression due to EXT-5105 where CTRL+SHIFT+I was bringing up the InventorySP instead of InventoryFloater. Note that this reverts some code checked in for EXT-5105 (i.e. it re-adds in some functions that were deleted).
As a side bonus, now the Gestures CTRL+G menu option shows as being checked when the gestures floater is active.
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 95ce6d6ff4..07a366da7f 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -55,34 +55,42 @@ </menu_item_call> <menu_item_check label="My Inventory" - layout="topleft" name="Inventory" - shortcut="control|I"> + layout="topleft" + shortcut="control|shift|I" + visible="false"> <menu_item_check.on_check - function="SidetrayPanelVisible" - parameter="sidepanel_inventory" /> + function="Floater.Visible" + parameter="inventory" /> <menu_item_check.on_click - function="ShowSidetrayPanel" - parameter="sidepanel_inventory" /> + function="Floater.Toggle" + parameter="inventory" /> </menu_item_check> - <menu_item_call - label="Show Inventory in Side Tray" + <menu_item_check + label="My Inventory" name="ShowSidetrayInventory" + layout="topleft" shortcut="control|I" - visible="false"> - <menu_item_call.on_click + visible="true"> + <menu_item_check.on_check + function="SidetrayPanelVisible" + parameter="sidepanel_inventory" /> + <menu_item_check.on_click function="ShowSidetrayPanel" parameter="sidepanel_inventory" /> - </menu_item_call> - <menu_item_call + </menu_item_check> + <menu_item_check label="My Gestures" layout="topleft" name="Gestures" shortcut="control|G"> - <menu_item_call.on_click + <menu_item_check.on_check + function="Floater.Visible" + parameter="gestures" /> + <menu_item_check.on_click function="Floater.Toggle" parameter="gestures" /> - </menu_item_call> + </menu_item_check> <menu label="My Status" layout="topleft" |