summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2010-03-19 17:55:43 -0400
committerKent Quirk <q@lindenlab.com>2010-03-19 17:55:43 -0400
commit48b169dbc2b52017b47fc0bc87fb5fdfb2310f9d (patch)
treeb45115063fd28e3f115b05102f058c7e7c47671f /indra/newview/skins/default
parente25b39b94bf013b30bb81c8c2d2934ec17e0f77b (diff)
parent90b8ed39e2cdd6bf6666a34060d5ee9347102237 (diff)
Merge
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 158e764eae..a08bc16066 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -177,7 +177,8 @@
label="Nearby Chat"
layout="topleft"
name="Nearby Chat"
- shortcut="control|H">
+ shortcut="control|H"
+ use_mac_ctrl="true">
<menu_item_check.on_check
function="Floater.Visible"
parameter="nearby_chat" />