summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-09-11 15:25:24 -0400
committerOz Linden <oz@lindenlab.com>2013-09-11 15:25:24 -0400
commitf70296ec68c9205bfa9ec295393584155b488e48 (patch)
tree1207d1ec5520b277b6a5252b32a41425626e20ac /indra/newview
parentf6bcf6dd39b80befda027b3a5ee3bb4f66bb6221 (diff)
parentf4d2e21f4fdf6953cfa375bd716b1458e3de14e8 (diff)
merge changes for storm-1902
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/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 dabfc4eebd..0e95a9d9a9 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -180,7 +180,7 @@
name="Preferences"
shortcut="control|P">
<menu_item_call.on_click
- function="Floater.Show"
+ function="Floater.Toggle"
parameter="preferences" />
</menu_item_call>
<menu_item_call