From dfa44707bbe137eaa232d38b5e4ff0c930af6b6f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 12 Aug 2014 19:51:02 +0200 Subject: [PATCH] FIRE-14329: Disabling display names makes people with display names show their legacy names twice in the contact list --- indra/newview/fsfloatercontacts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp index c0d37722f1..fac209f91f 100644 --- a/indra/newview/fsfloatercontacts.cpp +++ b/indra/newview/fsfloatercontacts.cpp @@ -1187,7 +1187,7 @@ void FSFloaterContacts::onDisplayNameChanged() std::string FSFloaterContacts::getFullName(const LLAvatarName& av_name) { - if (av_name.isDisplayNameDefault()) + if (av_name.isDisplayNameDefault() || !gSavedSettings.getBOOL("UseDisplayNames")) { return av_name.getDisplayName(); }