From 0c55af934d19145993c6ec0756397fa75f9a9842 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 2 Apr 2013 21:46:00 +0100
Subject: [PATCH] added display of FB name to SL user in FBCTEST list
---
indra/newview/llavatarlist.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index a4075156213..fb6d0428073 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -643,7 +643,7 @@ void LLAvatarListSocial::addSocialItem(const LLUUID& id, const std::string& name
LLAvatarListItem* item = new LLAvatarListItem();
item->setAvatarId(id, mSessionID, mIgnoreOnlineStatus, false); // this sets the name as a side effect
- item->setAvatarName(has_avatar_name ? avatar_name.mDisplayName : name);
+ item->setAvatarName(has_avatar_name ? avatar_name.mDisplayName + " (" + name + ")" : name);
item->setOnline(mIgnoreOnlineStatus ? true : is_online);
item->showLastInteractionTime(mShowLastInteractionTime);
--
GitLab