From fd83804a1ca95d7bbe10fb3a7586b12d3cbd6085 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 16 Jan 2015 11:55:36 +0200
Subject: [PATCH] MAINT-4799 FIXED Show complete avatar names in confirmation
dialog.
---
indra/newview/llavataractions.cpp | 2 +-
indra/newview/lltooldraganddrop.cpp | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 8235b131181..0e30c079ff0 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -785,7 +785,7 @@ void LLAvatarActions::buildResidentsString(std::vector<LLAvatarName> avatar_name
const std::string& separator = LLTrans::getString("words_separator");
for (std::vector<LLAvatarName>::const_iterator it = avatar_names.begin(); ; )
{
- residents_string.append((*it).getDisplayName());
+ residents_string.append((*it).getCompleteName());
if (++it == avatar_names.end())
{
break;
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 8561d265de2..b077cad9f80 100755
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -34,6 +34,7 @@
#include "llagentcamera.h"
#include "llagentwearables.h"
#include "llappearancemgr.h"
+#include "llavatarnamecache.h"
#include "lldictionary.h"
#include "llfloaterreg.h"
#include "llfloatertools.h"
@@ -1705,9 +1706,14 @@ bool LLToolDragAndDrop::handleGiveDragAndDrop(LLUUID dest_agent, LLUUID session_
return true;
}
-
+ std::string dest_name = session->mName;
+ LLAvatarName av_name;
+ if(LLAvatarNameCache::get(dest_agent, &av_name))
+ {
+ dest_name = av_name.getCompleteName();
+ }
// If an IM session with destination agent is found item offer will be logged in this session.
- show_object_sharing_confirmation(session->mName, inv_obj, dest, dest_agent, session_id);
+ show_object_sharing_confirmation(dest_name, inv_obj, dest, dest_agent, session_id);
}
}
else
--
GitLab