summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-02-21 19:15:48 -0800
committerMerov Linden <merov@lindenlab.com>2013-02-21 19:15:48 -0800
commit86150b4019d1a84b4af73f0ea18c47baff955562 (patch)
treee5414250c8b0c4f18e3a128d09b9da1494dadd75 /indra/newview/skins/default
parentf79f9f111b0db67cacfe9bbe453737f3979b3ba9 (diff)
CHUI-568 : WIP : Introduced Ctrl-T and Ctrl-H for conversations and nearby chat
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml8
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