From e9fd76ce2fbc6b53acb95b8cee8a266c0060c8fd Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 11 May 2010 10:34:51 -0700 Subject: Implemented #270: Say the name of the avatar and key copied in chat when Copy Key is pressed --- linden/indra/newview/llpanelavatar.cpp | 13 +++++++++++++ .../indra/newview/skins/default/xui/en-us/panel_avatar.xml | 3 +++ 2 files changed, 16 insertions(+) (limited to 'linden') diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp index 5d01154..dbdeb3c 100644 --- a/linden/indra/newview/llpanelavatar.cpp +++ b/linden/indra/newview/llpanelavatar.cpp @@ -50,6 +50,7 @@ #include "llcheckboxctrl.h" #include "llfloater.h" +#include "llfloaterchat.h" #include "llfloaterfriends.h" #include "llfloatergroupinfo.h" #include "llfloatergroups.h" @@ -1623,6 +1624,18 @@ void LLPanelAvatar::onClickCopyUUID(void *userdata) { LLPanelAvatar* self = (LLPanelAvatar*) userdata; + // Say same info in chat -- MC + LLStringUtil::format_map_t targs; + targs["[KEY]"] = self->mAvatarID.asString(); + targs["[AVATAR]"] = self->mPanelSecondLife->getChild("name")->getText(); + std::string msg = self->mPanelSecondLife->getString("copy_key_info"); + LLStringUtil::format(msg, targs); + + LLChat chat; + chat.mSourceType = CHAT_SOURCE_SYSTEM; + chat.mText = msg; + LLFloaterChat::addChat(chat); + std::string buffer; (self->mAvatarID).toString(buffer); gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(buffer)); 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 b53bb3e..0fb1f92 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 @@ -36,6 +36,9 @@ Not Age-verified + + Copied key for [AVATAR] to clipboard: [KEY] +