diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-10 10:34:26 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-10 10:34:26 -0700 |
| commit | 6074f65991f4a9e928ef9609e90d8e9570350e63 (patch) | |
| tree | 9d287cd76903efdbf18058102d3f5274691ec585 /indra/newview/skins/default | |
| parent | 5aa3f3c808976c3b709bd8141d4338e910c49691 (diff) | |
| parent | d2f71df15f14fe0f7e17f962d39d19dd571fc530 (diff) | |
Merge with vwr-dev-mat
Diffstat (limited to 'indra/newview/skins/default')
| -rwxr-xr-x | 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 100755 --- 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" |