diff options
| author | Cho <cho@lindenlab.com> | 2013-04-04 00:04:52 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-04-04 00:04:52 +0100 |
| commit | 819bbce34a2f265287df1e4e9adde90b5a70c8b6 (patch) | |
| tree | ae4ed8ea548dc551f33b298452d12564273bf8a4 | |
| parent | a8e89fbb46730ca51241f4f0b51d06210e2cf347 (diff) | |
made FB+SL friends show up as <fb_name> (<sl_name)
| -rw-r--r-- | indra/newview/llavatarlist.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llsociallist.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp index fb6d042807..59cea91b39 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 + ")" : name); + item->setAvatarName(has_avatar_name ? name + " (" + avatar_name.mDisplayName + ")" : name); item->setOnline(mIgnoreOnlineStatus ? true : is_online); item->showLastInteractionTime(mShowLastInteractionTime); diff --git a/indra/newview/llsociallist.cpp b/indra/newview/llsociallist.cpp index 2402a7c4b8..6cf0851fd7 100644 --- a/indra/newview/llsociallist.cpp +++ b/indra/newview/llsociallist.cpp @@ -72,7 +72,7 @@ void LLSocialList::addNewItem(const LLUUID& id, const std::string& name, BOOL is item->mIcon->setValue(id); } - item->setName(has_avatar_name ? avatar_name.mDisplayName + " (" + name + ")" : name, mNameFilter); + item->setName(has_avatar_name ? name + " (" + avatar_name.mDisplayName + ")" : name, mNameFilter); addItem(item, id, pos); } |