diff options
author | dolphin <dolphin@lindenlab.com> | 2013-04-04 17:10:28 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-04-04 17:10:28 -0700 |
commit | 56badfe3498b5eeefb5c06c4b0d51eb1c62ded9c (patch) | |
tree | c1b61940e39d615201e18259bcab1762c5a8c655 /indra/newview/skins/default/xui/en/menu_viewer.xml | |
parent | f684d897f532bcba87cda1f72bd19efac82f6cb6 (diff) | |
parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 564f70ba0e..6f7c70196c 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -139,6 +139,7 @@ name="Status" tear_off="true"> <menu_item_check + name="Away" label="Away"> <menu_item_check.on_check function="View.Status.CheckAway" /> @@ -146,6 +147,7 @@ function="World.SetAway" /> </menu_item_check> <menu_item_check + name="Do Not Disturb" label="Do Not Disturb"> <menu_item_check.on_check function="View.Status.CheckDoNotDisturb" /> @@ -265,6 +267,7 @@ parameter="speak" /> </menu_item_check> <menu_item_check + name="Conversation Log..." label="Conversation Log..."> <menu_item_check.on_check function="Floater.Visible" @@ -360,6 +363,7 @@ </menu_item_call> <menu_item_separator/> <menu_item_check + name="Do Not Disturb" label="Do Not Disturb"> <menu_item_check.on_check function="View.Status.CheckDoNotDisturb" /> @@ -3059,13 +3063,6 @@ <menu_item_call.on_click function="Advanced.PrintAgentInfo" /> </menu_item_call> - <menu_item_call - label="Memory Stats" - name="Memory Stats" - shortcut="control|alt|shift|M"> - <menu_item_call.on_click - function="Advanced.PrintTextureMemoryStats" /> - </menu_item_call> <menu_item_check label="Region Debug Console" name="Region Debug Console" |