diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-08 14:46:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-08 14:46:00 -0400 |
| commit | 1b984d8f40d805341b8c1fc670c29b32c25ce227 (patch) | |
| tree | fb73a6224dfe7ff7d5bf4619a799b0ededffcb64 /indra/newview/skins/default/xui/en | |
| parent | 21ba1e9c1e8afeb1b3cf67462f6e16ff8f6ae91a (diff) | |
| parent | 1beb15c93b139e4494bb90cce30b1c67accb4b08 (diff) | |
merge changes for 3.5.1-release
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 9 |
1 files changed, 2 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 2dc00e1df3..500c11da74 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -259,6 +259,7 @@ parameter="speak" /> </menu_item_check> <menu_item_check + name="Conversation Log..." label="Conversation Log..."> <menu_item_check.on_check function="Floater.Visible" @@ -354,6 +355,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" /> @@ -3055,13 +3057,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" |