From 293820747f8279a2583d3cd8b4c3628624369fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Fri, 30 Aug 2019 15:39:23 -0400
Subject: [PATCH] Add the Avatar submenu to the agent menus and create parity
 between them

A little mouse hover to open a submenu is better than an unwieldy menu
Moves Focus into the avatar section
---
 .../skins/default/xui/en-us/menu_avs_list.xml | 152 +++++++++---------
 .../default/xui/en-us/menu_local_avs.xml      |   9 +-
 .../default/xui/en-us/menu_url_agent.xml      |  60 +++----
 .../default/xui/en-us/menu_url_agent_mini.xml |   8 +-
 4 files changed, 117 insertions(+), 112 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
index be949a2c8..acec8e1b8 100644
--- a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
@@ -4,81 +4,83 @@
     <on_click function="List.ShowProfile"/>
     <on_enable function="List.EnableAnySelected"/>
   </menu_item_call>
-  <menu_item_call label="Web Profile" name="Web Profile">
-    <on_click function="List.ShowWebProfile"/>
-    <on_visible function="List.VisibleWebProfile"/>
-  </menu_item_call>
-  <menu_item_call label="Pay" name="Pay">
-    <on_click function="List.Pay"/>
-    <on_enable function="List.EnableSingleSelected"/>
-  </menu_item_call>
-  <menu_item_call label="Instant Message" name="Instant Message">
-    <on_click function="List.StartIM"/>
-    <on_visible function="List.EnableSingleSelected"/>
-  </menu_item_call>
-  <menu_item_call label="Conference Chat" name="Conference Chat">
-    <on_click function="List.StartConference"/>
-    <on_visible function="List.EnableMultipleSelected"/>
-  </menu_item_call>
-  <menu_item_call label="Call" name="Call">
-    <on_click function="List.StartCall"/>
-    <on_enable function="List.EnableCall"/>
-    <on_visible function="List.EnableSingleSelected"/>
-  </menu_item_call>
-  <menu_item_call label="Conference Call" name="Conference Call">
-    <on_click function="List.StartAdhocCall"/>
-    <on_enable function="List.EnableCall"/>
-    <on_visible function="List.EnableMultipleSelected"/>
-  </menu_item_call>
-  <menu_item_call label="Add Friend" name="Add Friend">
-    <on_click function="List.RequestFriendship"/>
-    <on_enable function="List.EnableSingleSelected"/>
-    <on_visible function="List.EnableIsNotFriend"/>
-  </menu_item_call>
-  <menu_item_call label="Remove Friend" name="Remove Friend">
-    <on_click function="List.RemoveFriend"/>
-    <on_enable function="List.EnableSingleSelected"/>
-    <on_visible function="List.EnableIsFriend"/>
-  </menu_item_call>
-  <menu_item_call label="Invite To Group" name="Invite To Group">
-    <on_click function="List.InviteToGroup"/>
-    <on_visible function="List.EnableAnySelected"/>
-  </menu_item_call>
-  <menu_item_call label="Offer Teleport" name="Offer Teleport">
-    <on_click function="List.OfferTeleport"/>
-    <on_enable function="List.EnableAnySelected"/>
-  </menu_item_call>
-  <menu_item_call label="Teleport To" name="Teleport To">
-    <on_click function="Radar.TeleportTo"/>
-    <on_enable function="List.EnableSingleSelected"/>
-    <on_visible function="List.IsNearby"/>
-  </menu_item_call>
-  <menu_item_call label="Request Teleport" name="Request Teleport">
-    <on_click function="List.RequestTeleport"/>
-    <on_visible function="List.EnableSingleSelected"/>
-  </menu_item_call>
-  <menu_item_call label="Share" name="Share">
-    <on_click function="List.Share"/>
-    <on_visible function="List.EnableSingleSelected"/>
-  </menu_item_call>
-  <menu_item_call label="Chat History" name="Chat History">
-    <on_click function="List.ShowLog"/>
-    <on_enable function="List.EnableAnySelected"/>
-  </menu_item_call>
-  <menu_item_call label="Track/Untrack" name="Track/Untrack">
-    <on_click function="List.Track"/>
-    <on_enable function="List.EnableSingleSelected"/>
-    <on_visible function="List.IsNearby"/>
-  </menu_item_call>
-  <menu_item_separator/>
-  <menu_item_call label="Copy Key" name="Copy Key">
-    <on_click function="List.CopyUUIDs"/>
-    <on_enable function="List.EnableAnySelected"/>
-  </menu_item_call>
-  <menu_item_call label="Copy SLURL" name="Copy SLURL">
-    <on_click function="List.CopySLURL"/>
-    <on_visible function="List.EnableSingleSelected"/>
-  </menu_item_call>
+  <menu label="Avatar" name="Avatar" create_jump_keys="true">
+    <menu_item_call label="Web Profile" name="Web Profile">
+      <on_click function="List.ShowWebProfile"/>
+      <on_visible function="List.VisibleWebProfile"/>
+    </menu_item_call>
+    <menu_item_call label="Pay" name="Pay">
+      <on_click function="List.Pay"/>
+      <on_enable function="List.EnableSingleSelected"/>
+    </menu_item_call>
+    <menu_item_call label="Instant Message" name="Instant Message">
+      <on_click function="List.StartIM"/>
+      <on_visible function="List.EnableSingleSelected"/>
+    </menu_item_call>
+    <menu_item_call label="Conference Chat" name="Conference Chat">
+      <on_click function="List.StartConference"/>
+      <on_visible function="List.EnableMultipleSelected"/>
+    </menu_item_call>
+    <menu_item_call label="Call" name="Call">
+      <on_click function="List.StartCall"/>
+      <on_enable function="List.EnableCall"/>
+      <on_visible function="List.EnableSingleSelected"/>
+    </menu_item_call>
+    <menu_item_call label="Conference Call" name="Conference Call">
+      <on_click function="List.StartAdhocCall"/>
+      <on_enable function="List.EnableCall"/>
+      <on_visible function="List.EnableMultipleSelected"/>
+    </menu_item_call>
+    <menu_item_call label="Add Friend" name="Add Friend">
+      <on_click function="List.RequestFriendship"/>
+      <on_enable function="List.EnableSingleSelected"/>
+      <on_visible function="List.EnableIsNotFriend"/>
+    </menu_item_call>
+    <menu_item_call label="Remove Friend" name="Remove Friend">
+      <on_click function="List.RemoveFriend"/>
+      <on_enable function="List.EnableSingleSelected"/>
+      <on_visible function="List.EnableIsFriend"/>
+    </menu_item_call>
+    <menu_item_call label="Invite To Group" name="Invite To Group">
+      <on_click function="List.InviteToGroup"/>
+      <on_visible function="List.EnableAnySelected"/>
+    </menu_item_call>
+    <menu_item_call label="Offer Teleport" name="Offer Teleport">
+      <on_click function="List.OfferTeleport"/>
+      <on_enable function="List.EnableAnySelected"/>
+    </menu_item_call>
+    <menu_item_call label="Teleport To" name="Teleport To">
+      <on_click function="Radar.TeleportTo"/>
+      <on_enable function="List.EnableSingleSelected"/>
+      <on_visible function="List.IsNearby"/>
+    </menu_item_call>
+    <menu_item_call label="Request Teleport" name="Request Teleport">
+      <on_click function="List.RequestTeleport"/>
+      <on_visible function="List.EnableSingleSelected"/>
+    </menu_item_call>
+    <menu_item_call label="Share" name="Share">
+      <on_click function="List.Share"/>
+      <on_visible function="List.EnableSingleSelected"/>
+    </menu_item_call>
+    <menu_item_call label="Chat History" name="Chat History">
+      <on_click function="List.ShowLog"/>
+      <on_enable function="List.EnableAnySelected"/>
+    </menu_item_call>
+    <menu_item_call label="Track/Untrack" name="Track/Untrack">
+      <on_click function="List.Track"/>
+      <on_enable function="List.EnableSingleSelected"/>
+      <on_visible function="List.IsNearby"/>
+    </menu_item_call>
+    <menu_item_separator/>
+    <menu_item_call label="Copy Key" name="Copy Key">
+      <on_click function="List.CopyUUIDs"/>
+      <on_enable function="List.EnableAnySelected"/>
+    </menu_item_call>
+    <menu_item_call label="Copy SLURL" name="Copy SLURL">
+      <on_click function="List.CopySLURL"/>
+      <on_visible function="List.EnableSingleSelected"/>
+    </menu_item_call>
+  </menu>
   <menu_item_call label="Focus" name="Focus">
     <on_click function="Radar.Focus"/>
     <on_enable function="List.EnableSingleSelected"/>
diff --git a/indra/newview/skins/default/xui/en-us/menu_local_avs.xml b/indra/newview/skins/default/xui/en-us/menu_local_avs.xml
index 16fcbed6c..49c076252 100644
--- a/indra/newview/skins/default/xui/en-us/menu_local_avs.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_local_avs.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Local Avs Menu" create_jump_keys="true">
+  <menu_item_call label="Profile" name="Profile">
+    <on_click function="List.ShowProfile"/>
+    <on_enable function="List.EnableAnySelected"/>
+  </menu_item_call>
   <menu label="Avatar" name="Avatar" create_jump_keys="true">
-    <menu_item_call label="Profile" name="Profile">
-      <on_click function="List.ShowProfile"/>
-      <on_enable function="List.EnableAnySelected"/>
-    </menu_item_call>
     <menu_item_call label="Web Profile" name="Web Profile">
       <on_click function="List.ShowWebProfile"/>
       <on_visible function="List.VisibleWebProfile"/>
@@ -69,6 +69,7 @@
       <on_click function="List.Track"/>
       <on_enable function="List.EnableSingleSelected"/>
     </menu_item_call>
+    <menu_item_separator/>
     <menu_item_call label="Copy Key" name="Copy Key">
       <on_click function="List.CopyUUIDs"/>
       <on_enable function="List.EnableAnySelected"/>
diff --git a/indra/newview/skins/default/xui/en-us/menu_url_agent.xml b/indra/newview/skins/default/xui/en-us/menu_url_agent.xml
index e23b42855..93575a684 100644
--- a/indra/newview/skins/default/xui/en-us/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_url_agent.xml
@@ -2,14 +2,15 @@
 <context_menu
  layout="topleft"
  label="User"
- name="Url Popup">  
-    <menu_item_call
-     label="View Profile"
-     layout="topleft"
-     name="show_agent">
-        <menu_item_call.on_click
-         function="Text.Url" userdata="ShowProfile" />         
-    </menu_item_call>
+ name="Url Popup">
+  <menu_item_call
+    label="Profile"
+    layout="topleft"
+    name="show_agent">
+    <menu_item_call.on_click
+      function="Text.Url" userdata="ShowProfile" />
+  </menu_item_call>
+  <menu name="Avatar" label="Avatar">
     <menu_item_call label="Web Profile" name="Web Profile">
       <on_click function="Text.Url.Ext" userdata="ShowWebProfile"/>
       <on_visible function="Text.Url.ExtVisible" userdata="ShowWebProfile"/>
@@ -23,7 +24,7 @@
      layout="topleft"
      name="send_im">
         <menu_item_call.on_click
-         function="Text.Url" userdata="SendIM" />        
+         function="Text.Url" userdata="SendIM" />
     </menu_item_call>
     <menu_item_call label="Call" name="Call">
       <on_click function="Text.Url.Ext" userdata="Call"/>
@@ -71,32 +72,33 @@
     <on_click function="Text.Url.Ext" userdata="Track"/>
     <on_visible function="Text.Url.ExtVisible" userdata="Track"/>
   </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
-    <menu_item_call
-     label="Copy Name to clipboard"
-     layout="topleft"
-     name="url_copy_label">
-        <menu_item_call.on_click
-         function="Text.Url" userdata="CopyLabel" />
-    </menu_item_call>
-    <menu_item_call
-     label="Copy SLURL to clipboard"
-     layout="topleft"
-     name="url_copy">
-        <menu_item_call.on_click
-         function="Text.Url" userdata="CopyUrl" />
-    </menu_item_call>
+  <menu_item_call label="Focus" name="Focus">
+    <on_click function="Text.Url.Ext" userdata="Focus"/>
+    <on_visible function="Text.Url.ExtVisible" userdata="Focus"/>
+  </menu_item_call>
+  </menu>
+  <menu_item_separator
+    layout="topleft" />
+  <menu_item_call
+    label="Copy Name to clipboard"
+    layout="topleft"
+    name="url_copy_label">
+    <menu_item_call.on_click
+      function="Text.Url" userdata="CopyLabel" />
+  </menu_item_call>
+  <menu_item_call
+    label="Copy SLURL to clipboard"
+    layout="topleft"
+    name="url_copy">
+    <menu_item_call.on_click
+      function="Text.Url" userdata="CopyUrl" />
+  </menu_item_call>
   <menu_item_call label="Copy Key to clipboard" name="key_copy">
     <menu_item_call.on_click function="Text.Url.CopyUUID" />
   </menu_item_call>
   <menu_item_call label="Select All" name="Select All">
     <on_click function="Text" userdata="SelectAll"/>
   </menu_item_call>
-  <menu_item_call label="Focus" name="Focus">
-    <on_click function="Text.Url.Ext" userdata="Focus"/>
-    <on_visible function="Text.Url.ExtVisible" userdata="Focus"/>
-  </menu_item_call>
   <menu label="Moderation" name="Moderation" create_jump_keys="true">
     <menu_item_call label="Mute" name="Mute">
       <on_click function="Text.Url.Ext" userdata="Mute"/>
diff --git a/indra/newview/skins/default/xui/en-us/menu_url_agent_mini.xml b/indra/newview/skins/default/xui/en-us/menu_url_agent_mini.xml
index c54fe7b61..a440abc4e 100644
--- a/indra/newview/skins/default/xui/en-us/menu_url_agent_mini.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_url_agent_mini.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <context_menu
-  layout="topleft"
-  label="User"
-  name="Url Mini Popup">
+ layout="topleft"
+ label="User"
+ name="Url Mini Popup">
   <menu_item_call
-    label="View Profile"
+    label="Profile"
     layout="topleft"
     name="show_agent">
     <menu_item_call.on_click