FIRE-14330: "Trim 'Resident' from legacy names" option does not work for people without last name and that have no display name set

2014-08-12 20:08:20 +02:00 · 2014-08-12 20:08:20 +02:00 · 32a2cb9197
parent dfa44707bb
commit 32a2cb9197
1 changed files with 4 additions and 0 deletions
--- a/indra/newview/fsfloatercontacts.cpp
+++ b/indra/newview/fsfloatercontacts.cpp
@ -1189,6 +1189,10 @@ 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();
 	}