summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorsimon <none@none>2013-03-20 15:25:14 -0700
committersimon <none@none>2013-03-20 15:25:14 -0700
commit8e54ae95d1417f51edd6c68c389fd6cd7322ca52 (patch)
treebb192b0d150eeff35099b07435c5f233c97adae2 /indra/newview/skins/default/xui/en
parent5dbb0a31da9bb3fb5ff7c5ead5d90808f9e4b797 (diff)
Prototype code for "simple imposter" mode rendering of avatars.
Reviewed by Kelly
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/menu_attachment_other.xml35
-rw-r--r--indra/newview/skins/default/xui/en/menu_avatar_other.xml39
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml9
3 files changed, 82 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 00d4b1dab1..87fa7c3f00 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -104,8 +104,43 @@
<menu_item_call.on_enable
function="Object.EnableInspect" />
</menu_item_call>
+
+ <menu_item_separator />
+
+ <menu_item_check
+ name="Normal"
+ label="Normal">
+ <menu_item_check.on_check
+ function="Avatar.CheckImposterMode"
+ parameter="0" />
+ <menu_item_check.on_click
+ function="Avatar.SetImposterMode"
+ parameter="0" />
+ </menu_item_check>
+ <menu_item_check
+ name="Always use imposter"
+ label="Always use imposter">
+ <menu_item_check.on_check
+ function="Avatar.CheckImposterMode"
+ parameter="1" />
+ <menu_item_check.on_click
+ function="Avatar.SetImposterMode"
+ parameter="1" />
+ </menu_item_check>
+ <menu_item_check
+ name="Never use imposter"
+ label="Never use imposter">
+ <menu_item_check.on_check
+ function="Avatar.CheckImposterMode"
+ parameter="2" />
+ <menu_item_check.on_click
+ function="Avatar.SetImposterMode"
+ parameter="2" />
+ </menu_item_check>
+
<menu_item_separator
layout="topleft" />
+
<menu_item_call
enabled="false"
label="Mute Particle Owner"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 73fa086f28..60b7e3e77c 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -39,8 +39,10 @@
<menu_item_call.on_click
function="Avatar.InviteToGroup" />
</menu_item_call>
+
<menu_item_separator />
- <menu_item_call
+
+ <menu_item_call
enabled="false"
label="Block"
name="Avatar Mute">
@@ -95,8 +97,43 @@
<menu_item_call.on_enable
function="EnablePayAvatar" />
</menu_item_call>
+
+ <menu_item_separator />
+
+ <menu_item_check
+ name="Normal"
+ label="Normal">
+ <menu_item_check.on_check
+ function="Avatar.CheckImposterMode"
+ parameter="0" />
+ <menu_item_check.on_click
+ function="Avatar.SetImposterMode"
+ parameter="0" />
+ </menu_item_check>
+ <menu_item_check
+ name="Always use imposter"
+ label="Always use imposter">
+ <menu_item_check.on_check
+ function="Avatar.CheckImposterMode"
+ parameter="1" />
+ <menu_item_check.on_click
+ function="Avatar.SetImposterMode"
+ parameter="1" />
+ </menu_item_check>
+ <menu_item_check
+ name="Never use imposter"
+ label="Never use imposter">
+ <menu_item_check.on_check
+ function="Avatar.CheckImposterMode"
+ parameter="2" />
+ <menu_item_check.on_click
+ function="Avatar.SetImposterMode"
+ parameter="2" />
+ </menu_item_check>
+
<menu_item_separator
layout="topleft" />
+
<menu_item_call
enabled="false"
label="Mute Particle Owner"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 544f06ac0c..4646d307aa 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -543,6 +543,15 @@
<menu_item_check.on_check
control="NavBarShowParcelProperties" />
</menu_item_check>
+ <menu_item_check
+ label="Simple Imposters"
+ name="RenderAutoMuteEnabled">
+ <menu_item_check.on_check
+ control="RenderAutoMuteEnabled" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="RenderAutoMuteEnabled" />
+ </menu_item_check>
<menu_item_separator />
<menu_item_check
label="Advanced Menu"