summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/skins/default/xui/en/menu_attachment_other.xml17
-rw-r--r--indra/newview/skins/default/xui/en/menu_avatar_other.xml13
2 files changed, 5 insertions, 25 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 14229db08d..5b94645b60 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- *NOTE: See also menu_avatar_other.xml -->
<context_menu
layout="topleft"
name="Avatar Pie">
<menu_item_call
label="View Profile"
- layout="topleft"
name="Profile...">
<menu_item_call.on_click
function="ShowAgentProfile"
@@ -13,7 +13,6 @@
<menu_item_call
enabled="false"
label="Add Friend"
- layout="topleft"
name="Add Friend">
<menu_item_call.on_click
function="Avatar.AddFriend" />
@@ -22,31 +21,26 @@
</menu_item_call>
<menu_item_call
label="IM"
- layout="topleft"
name="Send IM...">
<menu_item_call.on_click
function="Avatar.SendIM" />
</menu_item_call>
<menu_item_call
label="Call"
- layout="topleft"
name="Call">
<menu_item_call.on_click
function="Avatar.Call" />
</menu_item_call>
<menu_item_call
label="Invite to Group"
- layout="topleft"
name="Invite...">
<menu_item_call.on_click
function="Avatar.InviteToGroup" />
</menu_item_call>
- <menu_item_separator
- layout="topleft" />
+ <menu_item_separator />
<menu_item_call
enabled="false"
label="Block"
- layout="topleft"
name="Avatar Mute">
<menu_item_call.on_click
function="Avatar.Mute" />
@@ -55,7 +49,6 @@
</menu_item_call>
<menu_item_call
label="Report"
- layout="topleft"
name="abuse">
<menu_item_call.on_click
function="Avatar.ReportAbuse" />
@@ -86,7 +79,6 @@
</menu_item_call>
<menu_item_call
label="Zoom In"
- layout="topleft"
name="Zoom In">
<menu_item_call.on_click
function="Tools.LookAtSelection"
@@ -95,18 +87,15 @@
<menu_item_call
enabled="false"
label="Pay"
- layout="topleft"
name="Pay...">
<menu_item_call.on_click
function="PayObject" />
<menu_item_call.on_enable
function="EnablePayAvatar" />
</menu_item_call>
- <menu_item_separator
- layout="topleft" />
+ <menu_item_separator />
<menu_item_call
label="Object Profile"
- layout="topleft"
name="Object Inspect">
<menu_item_call.on_click
function="Object.Inspect" />
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 cf01a21f7c..0ad41546d2 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
<context_menu
layout="topleft"
name="Avatar Pie">
<menu_item_call
label="View Profile"
- layout="topleft"
name="Profile...">
<menu_item_call.on_click
function="ShowAgentProfile"
@@ -13,7 +13,6 @@
<menu_item_call
enabled="false"
label="Add Friend"
- layout="topleft"
name="Add Friend">
<menu_item_call.on_click
function="Avatar.AddFriend" />
@@ -22,31 +21,26 @@
</menu_item_call>
<menu_item_call
label="IM"
- layout="topleft"
name="Send IM...">
<menu_item_call.on_click
function="Avatar.SendIM" />
</menu_item_call>
<menu_item_call
label="Call"
- layout="topleft"
name="Call">
<menu_item_call.on_click
function="Avatar.Call" />
</menu_item_call>
<menu_item_call
label="Invite to Group"
- layout="topleft"
name="Invite...">
<menu_item_call.on_click
function="Avatar.InviteToGroup" />
</menu_item_call>
- <menu_item_separator
- layout="topleft" />
+ <menu_item_separator />
<menu_item_call
enabled="false"
label="Block"
- layout="topleft"
name="Avatar Mute">
<menu_item_call.on_click
function="Avatar.Mute" />
@@ -55,7 +49,6 @@
</menu_item_call>
<menu_item_call
label="Report"
- layout="topleft"
name="abuse">
<menu_item_call.on_click
function="Avatar.ReportAbuse" />
@@ -86,7 +79,6 @@
</menu_item_call>
<menu_item_call
label="Zoom In"
- layout="topleft"
name="Zoom In">
<menu_item_call.on_click
function="Tools.LookAtSelection"
@@ -95,7 +87,6 @@
<menu_item_call
enabled="false"
label="Pay"
- layout="topleft"
name="Pay...">
<menu_item_call.on_click
function="PayObject" />