summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-01-21 16:25:23 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-01-21 16:25:23 -0700
commit4af7e9eb64097c9fdcef86758fc42932d3ccd477 (patch)
tree3d4d5300b0c476d8343baad8d28c0809806d5c8b /indra/newview/skins/default/xui
parentbb3be2c07f492577254ae9ace5675eb92d10f061 (diff)
parente3f5b66d5a649b061e470bba44fa29a56f7b93b5 (diff)
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml10
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 2207e418c8..c2735c85e4 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1960,6 +1960,16 @@
function="ToggleControl"
parameter="DebugShowRenderInfo" />
</menu_item_check>
+ <menu_item_check
+ label="Show Texture Info"
+ name="Show Texture Info">
+ <menu_item_check.on_check
+ function="CheckControl"
+ parameter="DebugShowTextureInfo" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="DebugShowTextureInfo" />
+ </menu_item_check>
<menu_item_check
label="Show Matrices"
name="Show Matrices">