diff options
author | Callum Prentice <callum@lindenlab.com> | 2010-02-11 14:04:40 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2010-02-11 14:04:40 -0800 |
commit | f791d103c85fdb1a8b5f9f32365708915d1cfe74 (patch) | |
tree | 9e0fa8bf6cc748a1ba053400bd7a3f440345ded2 /indra/newview/skins/default/xui | |
parent | 92468f0dea2a9ddc57d89a64e0e8bb7b6cc1fd41 (diff) | |
parent | dc61885aa6d0894c913f3ce7ede410d1c18ce089 (diff) |
Merge with tip
Diffstat (limited to 'indra/newview/skins/default/xui')
-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" |