summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-02-11 13:43:47 -0500
committerLoren Shih <seraph@lindenlab.com>2010-02-11 13:43:47 -0500
commite612015500b9f17aab3d3c48f8717d9c0f0ae1ca (patch)
tree44073e8c296110b0c9e96704c57e7142a1bbd856 /indra/newview/skins
parent99b29fc394b56c69a07eafeedd213ee360ad684c (diff)
parent39fe664b97b946daf7984b946fede6f04ae731c4 (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml2
1 files changed, 1 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 09d86720f2..95ce6d6ff4 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -57,7 +57,7 @@
label="My Inventory"
layout="topleft"
name="Inventory"
- shortcut="control|shift|I">
+ shortcut="control|I">
<menu_item_check.on_check
function="SidetrayPanelVisible"
parameter="sidepanel_inventory" />