livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-4799 FIXED Show complete avatar names in confirmation dialog.

meow-7.2.2
Mnikolenko ProductEngine 2015-01-16 11:55:36 +02:00
parent 8f04b738d2
commit fd83804a1c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llavataractions.cpp
View File

@ -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;

10
indra/newview/lltooldraganddrop.cpp
View File

@ -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