summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-04-02 21:46:00 +0100
committerCho <cho@lindenlab.com>2013-04-02 21:46:00 +0100
commit0c55af934d19145993c6ec0756397fa75f9a9842 (patch)
treec2aad21b8b587b2f9f64b3d8d9eec08541395074
parent37b57559538aede47d46274208a6974d93caad1c (diff)
added display of FB name to SL user in FBCTEST list
-rw-r--r--indra/newview/llavatarlist.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index a407515621..fb6d042807 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);