diff options
| author | angela <angela@lindenlab.com> | 2009-11-10 10:48:17 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-10 10:48:17 +0800 |
| commit | 6106c9a7dadcf0ba4a33ad1ee826ccd31909b893 (patch) | |
| tree | aaee63d991c15958e0bfae447bff0c621e0b30f5 /indra/newview/skins/default | |
| parent | 4be7fa99e743732942a412fac5db4770d198999d (diff) | |
| parent | c84624b2e9656241bd08ea613e37c9d87087096b (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 24 |
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 |