Fix release merge issues (included upstream changes not yet in release from bear)

1 files changed, 3 insertions, 67 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
index 77b9095f7c..50910dff32 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
@@ -17,7 +17,7 @@
          parameter="profile" />
     </menu_item_call>
     <menu_item_call
-     label="IM"
+     label="Send IM..."
      layout="topleft"
      name="Send IM">
         <menu_item_call.on_click
@@ -25,26 +25,7 @@
          parameter="im" />
     </menu_item_call>
     <menu_item_call
-     label="Offer teleport"
-     layout="topleft"
-     name="Offer Teleport">
-        <on_click function="AvatarIcon.Action" parameter="teleport"/>
-    </menu_item_call>
-    <menu_item_call
-     label="Voice call"
-     layout="topleft"
-     name="Voice Call">
-        <on_click function="AvatarIcon.Action" parameter="voice_call"/>
-    </menu_item_call>
-    <menu_item_call
-     label="Chat history..."
-     layout="topleft"
-     name="Chat History">
-        <on_click function="AvatarIcon.Action" parameter="chat_history"/>   
-    </menu_item_call>
-    <menu_item_separator layout="topleft" name="separator_chat_history"/>
-    <menu_item_call
-     label="Add friend"
+     label="Add Friend..."
      layout="topleft"
      name="Add Friend">
         <menu_item_call.on_click
@@ -52,56 +33,11 @@
          parameter="add" />
     </menu_item_call>
     <menu_item_call
-     label="Remove friend"
+     label="Remove Friend..."
      layout="topleft"
      name="Remove Friend">
         <menu_item_call.on_click
          function="AvatarIcon.Action"
          parameter="remove" />
     </menu_item_call>
-    <menu_item_call
-     label="Invite to group..."
-     layout="topleft"
-     name="Invite Group">
-      <on_click function="AvatarIcon.Action" parameter="invite_to_group" />   
-    </menu_item_call>
-    <menu_item_separator layout="topleft" name="separator_invite_to_group"/>
-    <menu_item_call
-     label="Zoom In"
-     layout="topleft"
-     name="Zoom In">
-      <on_click function="AvatarIcon.Action" parameter="zoom_in" />
-    </menu_item_call>
-    <menu_item_call
-     label="Map"
-     layout="topleft"
-     name="Map">
-       <on_click function="AvatarIcon.Action" parameter="map" />
-    </menu_item_call>
-    <menu_item_call
-     label="Share"
-     layout="topleft"
-     name="Share">
-       <on_click function="AvatarIcon.Action" parameter="share" />
-    </menu_item_call>
-    <menu_item_call
-     label="Pay"
-     layout="topleft"
-     name="Pay">
-       <on_click function="AvatarIcon.Action" parameter="pay" />
-    </menu_item_call>
-    <menu_item_check
-     label="Block Voice"
-     layout="topleft"
-     name="Block Unblock">
-       <on_click function="AvatarIcon.Action" parameter="block_unblock" />
-       <on_check function="AvatarIcon.Check" parameter="is_blocked" />
-    </menu_item_check>
-    <menu_item_check
-     label="Block Text"
-     layout="topleft"
-     name="Mute Text">
-       <on_click function="AvatarIcon.Action" parameter="mute_unmute" />
-       <on_check function="AvatarIcon.Check" parameter="is_muted" />   
-  </menu_item_check>
 </menu>