summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-09-24 15:18:02 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-09-24 15:18:02 -0700
commit816d5201be3e6fc8deefbbd21b14cb3a8724e235 (patch)
tree52d95c7d750c75d459184d36ab27e5ef2a12f0a1
parent32b492f7d3d0888c45ddea07bc6d541413fcdbc3 (diff)
Adding copy to clipboard button for display names in profile panel
-rw-r--r--indra/newview/skins/default/textures/icons/Copy.pngbin0 -> 481 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile_view.xml18
3 files changed, 17 insertions, 4 deletions
diff --git a/indra/newview/skins/default/textures/icons/Copy.png b/indra/newview/skins/default/textures/icons/Copy.png
new file mode 100644
index 0000000000..d45134e9dd
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Copy.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 35309cbaf8..d7375806a9 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -110,7 +110,8 @@ with the same filename but different name
<texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_UpOff" file_name="widgets/ComboButton_UpOff.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="Container" file_name="containers/Container.png" preload="false" />
-
+ <texture name="Copy" file_name="icons/Copy.png" preload="false" />
+
<texture name="DisclosureArrow_Opened_Off" file_name="widgets/DisclosureArrow_Opened_Off.png" preload="true" />
<texture name="DownArrow" file_name="bottomtray/DownArrow.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 82e7eb4a47..47a0c44dea 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -39,11 +39,11 @@
value="Display Name:"
width="80" />
<text
- follows="top|left"
+ follows="top|right"
halign="right"
height="13"
layout="topleft"
- left="165"
+ right="-15"
name="status"
text_color="LtGray_50"
top_delta="0"
@@ -75,7 +75,18 @@
value="Jack Linden"
visible="true"
use_ellipses="true"
- width="275" />
+ width="275" />
+ <button
+ name="copy_to_clipboard"
+ layout="topleft"
+ follows="top|right"
+ image_overlay="Copy"
+ top_delta="0"
+ right="-15"
+ height="21"
+ width="21"
+ tab_stop="false"
+ tool_tip="Copy to Clipboard"/>
<text
follows="top|left"
height="13"
@@ -83,6 +94,7 @@
left="45"
name="user_label"
text_color="LtGray"
+ top_pad="10"
value="Username:"
width="70" />
<text