summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-10 12:15:42 +0800
committerangela <angela@lindenlab.com>2009-11-10 12:15:42 +0800
commitae27a93395ef01535e03e02ec9fa5e221ce58e23 (patch)
tree0529dc96ad0f1ed9513652aad18e9702d676b772 /indra/newview/skins
parent5662a8d126b3dab1100aab014aeaeb1752dba26a (diff)
parent6106c9a7dadcf0ba4a33ad1ee826ccd31909b893 (diff)
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml24
1 files changed, 4 insertions, 20 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index df2c2465c5..dbc9601680 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1932,18 +1932,15 @@
function="Advanced.ToggleConsole"
parameter="debug" />
</menu_item_check>
- <menu_item_check
+ <menu_item_call
label="Notifications Console"
layout="topleft"
name="Notifications"
shortcut="control|shift|5">
- <menu_item_check.on_check
- function="Advanced.CheckConsole"
- parameter="notifications" />
- <menu_item_check.on_click
- function="Floater.Show"
+ <menu_item_call.on_click
+ function="Floater.Toggle"
parameter="notifications_console" />
- </menu_item_check>
+ </menu_item_call>
<menu_item_check
label="Texture Size Console"
layout="topleft"
@@ -1994,19 +1991,6 @@
function="Advanced.ToggleConsole"
parameter="memory view" />
</menu_item_check>
- <menu_item_check
- label="Notifications Console"
- layout="topleft"
- name="Notifications"
- shortcut="control|shift|5"
- use_mac_ctrl="true">
- <menu_item_check.on_check
- function="Advanced.CheckConsole"
- parameter="notifications" />
- <menu_item_check.on_click
- function="Floater.Show"
- parameter="notifications_console" />
- </menu_item_check>
<menu_item_separator
layout="topleft" />
<menu_item_call