diff options
| author | Cho <cho@lindenlab.com> | 2013-02-25 18:11:51 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-02-25 18:11:51 +0000 |
| commit | cbbf1504f015f42e3426a92129824e05021e1fe3 (patch) | |
| tree | 4922b33e421f7c1184330f62793f6f9519e149de /indra/newview/skins/default/xui/en/menu_viewer.xml | |
| parent | 6194302a849431e84c046325d3cd19e92f62aa6f (diff) | |
| parent | 4b6e1c26f05d89aa130a899803553940069457c0 (diff) | |
merging
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index b50deb7d7a..544f06ac0c 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -183,8 +183,7 @@ </menu_item_call> <menu_item_call label="Toolbar buttons..." - name="Toolbars" - shortcut="control|T"> + name="Toolbars"> <menu_item_call.on_click function="Floater.Toggle" parameter="toybox" /> @@ -223,7 +222,8 @@ tear_off="true"> <menu_item_check label="Conversations..." - name="Conversations"> + name="Conversations" + shortcut="control|T"> <menu_item_check.on_check function="Floater.IsOpen" parameter="im_container" /> @@ -240,7 +240,7 @@ function="Floater.Visible" parameter="nearby_chat" /> <menu_item_check.on_click - function="Floater.Toggle" + function="Floater.ToggleOrBringToFront" parameter="nearby_chat" /> </menu_item_check> <menu_item_check |