summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/menu_viewer.xml
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-07-23 19:21:34 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-07-23 19:21:34 -0700
commit4feef5af63f6294249aa50e37fba712cd9ddec91 (patch)
treed288ba7c65611f95762c20b6a7c244d7348bcec8 /indra/newview/skins/default/xui/en/menu_viewer.xml
parente7e0e514fdc3b522787e18fddee89b9f9fbbe834 (diff)
parent364566924188c7aed5d391bf9a226fc4779ba020 (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml30
1 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f9a4acb1e3..1aa55acf2d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -193,6 +193,15 @@
<menu_item_call.on_click
function="View.ToggleUI" />
</menu_item_call>
+ <menu_item_check
+ label="Show HUD Attachments"
+ name="Show HUD Attachments"
+ shortcut="alt|shift|H">
+ <menu_item_check.on_check
+ function="View.CheckHUDAttachments" />
+ <menu_item_check.on_click
+ function="View.ShowHUDAttachments" />
+ </menu_item_check>
<menu_item_separator/>
@@ -291,6 +300,12 @@
function="SideTray.PanelPeopleTab"
parameter="nearby_panel" />
</menu_item_call>
+ <menu_item_call
+ label="Block List"
+ name="Block List">
+ <menu_item_call.on_click
+ function="Communicate.BlockList" />
+ </menu_item_call>
</menu>
<menu
create_jump_keys="true"
@@ -1409,15 +1424,6 @@
function="View.HighlightTransparent" />
</menu_item_check>
<menu_item_check
- label="Show HUD Attachments"
- name="Show HUD Attachments"
- shortcut="alt|shift|H">
- <menu_item_check.on_check
- function="View.CheckHUDAttachments" />
- <menu_item_check.on_click
- function="View.ShowHUDAttachments" />
- </menu_item_check>
- <menu_item_check
label="Show Mouselook Crosshairs"
name="ShowCrosshairs">
<menu_item_check.on_check
@@ -3160,12 +3166,6 @@
<menu_item_call.on_click
function="Advanced.TestFemale" />
</menu_item_call>
- <menu_item_call
- label="Toggle PG"
- name="Toggle PG">
- <menu_item_call.on_click
- function="Advanced.TogglePG" />
- </menu_item_call>
<menu_item_check
label="Allow Select Avatar"
name="Allow Select Avatar">