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

FIRE-14330: Better fix

Ansariel 2014-08-12 20:19:22 +02:00
parent 32a2cb9197
commit ab2e6f8a09
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/fsfloatercontacts.cpp
View File

@ -1189,11 +1189,7 @@ std::string FSFloaterContacts::getFullName(const LLAvatarName& av_name)
{
if (av_name.isDisplayNameDefault() || !gSavedSettings.getBOOL("UseDisplayNames"))
{
if (!gSavedSettings.getBOOL("FSTrimLegacyNames"))
{
return av_name.getUserNameForDisplay();
}
return av_name.getDisplayName();
return av_name.getUserNameForDisplay();
}
if (gSavedSettings.getS32("FSFriendListFullNameFormat"))