From 32a2cb9197384d531274ce6181e4f257c3f66a24 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 12 Aug 2014 20:08:20 +0200
Subject: [PATCH] FIRE-14330: "Trim 'Resident' from legacy names" option does
 not work for people without last name and that have no display name set

---
 indra/newview/fsfloatercontacts.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp
index fac209f91f..7bbd130bc4 100644
--- 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();
 	}