From 8ef538f3ec888c2568dabdd5ace44138a4d12396 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 26 Dec 2009 10:47:39 -0700
Subject: Added copy key button to profile window
---
linden/indra/newview/llpanelavatar.cpp | 12 ++++++++++++
linden/indra/newview/llpanelavatar.h | 1 +
.../indra/newview/skins/default/xui/en-us/panel_avatar.xml | 7 +++++--
3 files changed, 18 insertions(+), 2 deletions(-)
(limited to 'linden')
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 489f0d3..5d01154 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -375,6 +375,7 @@ BOOL LLPanelAvatarSecondLife::postBuild(void)
childSetAction("Offer Teleport...", LLPanelAvatar::onClickOfferTeleport,
getPanelAvatar() );
+ childSetAction("btn_copy_uuid", LLPanelAvatar::onClickCopyUUID, getPanelAvatar() );
childSetDoubleClickCallback("groups", onDoubleClickGroup, this );
@@ -1618,6 +1619,17 @@ void LLPanelAvatar::onClickOfferTeleport(void *userdata)
// static
+void LLPanelAvatar::onClickCopyUUID(void *userdata)
+{
+ LLPanelAvatar* self = (LLPanelAvatar*) userdata;
+
+ std::string buffer;
+ (self->mAvatarID).toString(buffer);
+ gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(buffer));
+}
+
+
+// static
void LLPanelAvatar::onClickPay(void *userdata)
{
LLPanelAvatar* self = (LLPanelAvatar*) userdata;
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index 01653d8..72a47f5 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -323,6 +323,7 @@ public:
static void onClickUnfreeze(void *userdata);
static void onClickCSR( void *userdata);
static void onClickMute( void *userdata);
+ static void onClickCopyUUID( void *userdata);
private:
void enableOKIfReady();
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 694cfca..ed5282d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -85,7 +85,7 @@
bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
mouse_opaque="true" name="label2" v_pad="0" width="145">
- Account:
+ Account info:
@@ -120,7 +120,10 @@
border_thickness="1" bottom="-23" enabled="false" follows="left|top"
font="SansSerifSmall" height="16" is_unicode="false" left="12"
max_length="254" mouse_opaque="false" name="name"
- width="235" />
+ width="155" />
+