4 files changed, 61 insertions, 10 deletions
diff --git a/indra/newview/skins/default/textures/icons/CopyBright.png b/indra/newview/skins/default/textures/icons/CopyBright.png
new file mode 100644
index 0000000000..8d21c47295
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/CopyBright.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 2540ee148d..444ad358c3 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -187,6 +187,7 @@ with the same filename but different name
   <texture name="Conv_log_inbox" file_name="icons/Conv_log_inbox.png" preload="false" />
 
   <texture name="Copy" file_name="icons/Copy.png" preload="false" />
+  <texture name="CopyBright" file_name="icons/CopyBright.png" preload="false" />
   
   <texture name="DisclosureArrow_Opened_Off" file_name="widgets/DisclosureArrow_Opened_Off.png" preload="true" />
 
diff --git a/indra/newview/skins/default/xui/en/menu_name_field.xml b/indra/newview/skins/default/xui/en/menu_name_field.xml
new file mode 100644
index 0000000000..3c5e5dd353
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_name_field.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ name="CopyMenu">
+    <menu_item_call
+     label="Copy Display Name"
+     layout="topleft"
+     name="copy_display">
+      <on_click function="Profile.CopyName" parameter="display"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Copy Agent Name"
+     layout="topleft"
+     name="copy_name">
+        <on_click function="Profile.CopyName" parameter="name"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Copy Agent Id"
+     layout="topleft"
+     name="copy_id">
+      <on_click function="Profile.CopyName" parameter="id"/>
+    </menu_item_call>  
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 8ebb1522b4..e577e6a4d2 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -112,23 +112,51 @@
      layout="topleft"
      visible="false"
     />
-    <text_editor
-     name="complete_name"
-     value="(loading...)"
-     enabled="false"
+    <panel
+     name="name_holder"
      top_delta="0"
      left_pad="4"
-     right="-6"
+     right="-5"
      height="20"
      follows="left|top|right"
      layout="topleft"
      allow_scroll="false"
      bg_visible="false"
-     border_visible="true"
-     h_pad="1"
-     v_pad="2"
-     max_length="254"
-    />
+     border_visible="false">
+      <text_editor
+       name="complete_name"
+       value="(loading...)"
+       enabled="false"
+       top="0"
+       left="0"
+       right="-1"
+       height="20"
+       follows="left|top|right"
+       layout="topleft"
+       allow_scroll="false"
+       bg_visible="false"
+       border_visible="true"
+       h_pad="1"
+       v_pad="2"
+       max_length="254"
+      />
+      <!--mouse_opaque="true"-->
+      <menu_button
+       name="copy_btn"
+       height="16"
+       right="-2"
+       top="2"
+       width="16"
+       image_selected="Copy"
+       image_unselected="Copy"
+       image_hover_selected="CopyBright"
+       image_hover_unselected="CopyBright"
+       hover_glow_amount="0.33"
+       chrome="true"
+       tab_stop="false"
+       follows="top|right"
+       layout="topleft" />
+    </panel>
     <layout_stack
      name="imagepositioner"
      top_pad="6"