2 files changed, 16 insertions, 0 deletions

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<LLNameEditor>("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 @@
       <string name="NotAgeVerified">
         Not Age-verified
       </string>
+      <string name="copy_key_info">
+        Copied key for [AVATAR] to clipboard: [KEY]
+      </string>
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-23" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifsmall" h_pad="0" halign="left" height="16" right="-12"