diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-28 21:23:35 -0700 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-28 21:23:35 -0700 |
commit | 125e216603e949ac97e4d8b649390f7c41a743c0 (patch) | |
tree | 4a7bfd367fd436738b13bfa6946137b300568a02 /indra/newview/skins/default/xui | |
parent | b4b3f78c455a614d7738c29cdc6383e857d6028d (diff) | |
parent | 948afb8ef436f661dd84e3c343e22934f92570ec (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index c2735c85e4..08ae0c233e 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1990,6 +1990,16 @@ function="ToggleControl" parameter="DebugShowColor" /> </menu_item_check> + <menu_item_check + label="Show Memory" + name="Show Memory"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugShowMemory" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugShowMemory" /> + </menu_item_check> <menu_item_separator/> |