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

FIRE-13756: Friends avatar picker only shows display name; Patch by Cinder Roxley

Ansariel 2014-05-16 09:30:40 +02:00
parent d6ef297f8f
commit f662c413c5
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llcallingcard.cpp
View File

@ -1090,7 +1090,23 @@ bool LLCollectAllBuddies::operator()(const LLUUID& buddy_id, LLRelationship* bud
{
LLAvatarName av_name;
LLAvatarNameCache::get(buddy_id, &av_name);
mFullName = av_name.getDisplayName();
// <FS:Ansariel> FIRE-13756: Friends avatar picker only shows display name
//mFullName = av_name.getDisplayName();
static LLCachedControl<bool> NameTagShowUsernames(gSavedSettings, "NameTagShowUsernames");
static LLCachedControl<bool> UseDisplayNames(gSavedSettings, "UseDisplayNames");
if ((NameTagShowUsernames) && (UseDisplayNames))
{
mFullName = av_name.getCompleteName();
}
else if (UseDisplayNames)
{
mFullName = av_name.getDisplayName();
}
else
{
mFullName = av_name.getUserNameForDisplay();
}
// </FS:Ansariel>
buddy_map_t::value_type value(mFullName, buddy_id);
if(buddy->isOnline())
{