summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-01-22 17:14:13 -0500
committerOz Linden <oz@lindenlab.com>2014-01-22 17:14:13 -0500
commitc241bb2af865370475308198ce6421900c92e345 (patch)
tree68b448b177e544af03f4d8cdbf9c6800739a67e9 /indra/newview
parentd8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff)
parentcda6e4488a6c87c47add50b4c7aa5ffd1303478d (diff)
merge changes for storm-1972
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/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 e5e2bd4c11..efff986086 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2554,6 +2554,16 @@
parameter="lights" />
</menu_item_check>
<menu_item_check
+ label="Particles"
+ name="Particles">
+ <menu_item_check.on_check
+ function="Advanced.CheckInfoDisplay"
+ parameter="particles" />
+ <menu_item_check.on_click
+ function="Advanced.ToggleInfoDisplay"
+ parameter="particles" />
+ </menu_item_check>
+ <menu_item_check
label="Collision Skeleton"
name="Collision Skeleton">
<menu_item_check.on_check