aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-12-26 10:47:39 -0700
committerMcCabe Maxsted2009-12-26 10:47:39 -0700
commit8ef538f3ec888c2568dabdd5ace44138a4d12396 (patch)
tree4552c355fabf2baee1b4a1883df7fe9201d830a5 /linden/indra
parentMade drag and drop work across the entire profile window (diff)
downloadmeta-impy-8ef538f3ec888c2568dabdd5ace44138a4d12396.zip
meta-impy-8ef538f3ec888c2568dabdd5ace44138a4d12396.tar.gz
meta-impy-8ef538f3ec888c2568dabdd5ace44138a4d12396.tar.bz2
meta-impy-8ef538f3ec888c2568dabdd5ace44138a4d12396.tar.xz
Added copy key button to profile window
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llpanelavatar.cpp12
-rw-r--r--linden/indra/newview/llpanelavatar.h1
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml7
3 files changed, 18 insertions, 2 deletions
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)
375 375
376 childSetAction("Offer Teleport...", LLPanelAvatar::onClickOfferTeleport, 376 childSetAction("Offer Teleport...", LLPanelAvatar::onClickOfferTeleport,
377 getPanelAvatar() ); 377 getPanelAvatar() );
378 childSetAction("btn_copy_uuid", LLPanelAvatar::onClickCopyUUID, getPanelAvatar() );
378 379
379 childSetDoubleClickCallback("groups", onDoubleClickGroup, this ); 380 childSetDoubleClickCallback("groups", onDoubleClickGroup, this );
380 381
@@ -1618,6 +1619,17 @@ void LLPanelAvatar::onClickOfferTeleport(void *userdata)
1618 1619
1619 1620
1620// static 1621// static
1622void LLPanelAvatar::onClickCopyUUID(void *userdata)
1623{
1624 LLPanelAvatar* self = (LLPanelAvatar*) userdata;
1625
1626 std::string buffer;
1627 (self->mAvatarID).toString(buffer);
1628 gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(buffer));
1629}
1630
1631
1632// static
1621void LLPanelAvatar::onClickPay(void *userdata) 1633void LLPanelAvatar::onClickPay(void *userdata)
1622{ 1634{
1623 LLPanelAvatar* self = (LLPanelAvatar*) userdata; 1635 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:
323 static void onClickUnfreeze(void *userdata); 323 static void onClickUnfreeze(void *userdata);
324 static void onClickCSR( void *userdata); 324 static void onClickCSR( void *userdata);
325 static void onClickMute( void *userdata); 325 static void onClickMute( void *userdata);
326 static void onClickCopyUUID( void *userdata);
326 327
327private: 328private:
328 void enableOKIfReady(); 329 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 @@
85 bottom_delta="-24" drop_shadow_visible="true" follows="left|top" 85 bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
86 font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12" 86 font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
87 mouse_opaque="true" name="label2" v_pad="0" width="145"> 87 mouse_opaque="true" name="label2" v_pad="0" width="145">
88 Account: 88 Account info:
89 </text> 89 </text>
90 <view_border bevel_style="in" bottom_delta="-52" follows="left|top" height="52" right="-12" 90 <view_border bevel_style="in" bottom_delta="-52" follows="left|top" height="52" right="-12"
91 mouse_opaque="false" name="acct_border" width="145" /> 91 mouse_opaque="false" name="acct_border" width="145" />
@@ -120,7 +120,10 @@
120 border_thickness="1" bottom="-23" enabled="false" follows="left|top" 120 border_thickness="1" bottom="-23" enabled="false" follows="left|top"
121 font="SansSerifSmall" height="16" is_unicode="false" left="12" 121 font="SansSerifSmall" height="16" is_unicode="false" left="12"
122 max_length="254" mouse_opaque="false" name="name" 122 max_length="254" mouse_opaque="false" name="name"
123 width="235" /> 123 width="155" />
124 <button bottom_delta="0" font="SansSerif" halign="center" height="20"
125 label="Copy Key" label_selected="Copy Key"
126 left_delta="157" mouse_opaque="true" name="btn_copy_uuid" width="80" />
124 <texture_picker allow_no_texture="true" bottom="271" can_apply_immediately="false" 127 <texture_picker allow_no_texture="true" bottom="271" can_apply_immediately="false"
125 default_image_name="None" follows="left|top" height="192" label="" 128 default_image_name="None" follows="left|top" height="192" label=""
126 left="12" mouse_opaque="true" name="img" scale_image="false" auto-resize="false" 129 left="12" mouse_opaque="true" name="img" scale_image="false" auto-resize="false"