From 5999998ead918e5e4b2e8536e67d9c9862024a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Fri, 30 Aug 2019 15:56:12 -0400
Subject: [PATCH] On second thought, let's reorganize that menu to be more chat
 oriented

Send IM should be exposed top level
Profile should be inside the submenu
The submenu should be called Actions
---
 .../default/xui/en-us/menu_url_agent.xml      | 20 ++++++-------------
 .../default/xui/en-us/menu_url_agent_mini.xml | 20 ++++++-------------
 2 files changed, 12 insertions(+), 28 deletions(-)

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 93575a684..a6eb22eca 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
@@ -3,14 +3,13 @@
  layout="topleft"
  label="User"
  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 label="Send IM..." name="send_im">
+    <on_click function="Text.Url" userdata="SendIM" />
   </menu_item_call>
-  <menu name="Avatar" label="Avatar">
+  <menu name="Actions" label="Actions">
+    <menu_item_call label="Profile" name="show_agent">
+      <on_click function="Text.Url" userdata="ShowProfile" />
+    </menu_item_call>
     <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"/>
@@ -19,13 +18,6 @@
       <on_click function="Text.Url.Ext" userdata="Pay"/>
       <on_visible function="Text.Url.ExtVisible" userdata="Pay"/>
     </menu_item_call>
-    <menu_item_call
-     label="Send IM..."
-     layout="topleft"
-     name="send_im">
-        <menu_item_call.on_click
-         function="Text.Url" userdata="SendIM" />
-    </menu_item_call>
     <menu_item_call label="Call" name="Call">
       <on_click function="Text.Url.Ext" userdata="Call"/>
       <on_visible function="Text.Url.ExtVisible" userdata="Call"/>
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 a440abc4e..bbddfcce3 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
@@ -3,14 +3,13 @@
  layout="topleft"
  label="User"
  name="Url Mini Popup">
-  <menu_item_call
-    label="Profile"
-    layout="topleft"
-    name="show_agent">
-    <menu_item_call.on_click
-      function="Text.Url" userdata="ShowProfile" />
+  <menu_item_call label="Send IM..." name="send_im">
+    <on_click function="Text.Url" userdata="SendIM" />
   </menu_item_call>
-  <menu name="Avatar" label="Avatar">
+  <menu name="Actions" label="Actions">
+    <menu_item_call label="Profile" name="show_agent">
+      <on_click function="Text.Url" userdata="ShowProfile" />
+    </menu_item_call>
     <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"/>
@@ -19,13 +18,6 @@
       <on_click function="Text.Url.Ext" userdata="Pay"/>
       <on_visible function="Text.Url.ExtVisible" userdata="Pay"/>
     </menu_item_call>
-    <menu_item_call
-     label="Send IM..."
-     layout="topleft"
-     name="send_im">
-        <menu_item_call.on_click
-         function="Text.Url" userdata="SendIM" />
-    </menu_item_call>
     <menu_item_call label="Call" name="Call">
       <on_click function="Text.Url.Ext" userdata="Call"/>
       <on_visible function="Text.Url.ExtVisible" userdata="Call"/>