livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made FB+SL friends show up as <fb_name> (<sl_name)

meow-7.2.2
Cho 2013-04-04 00:04:52 +01:00
parent a8e89fbb46
commit 819bbce34a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llavatarlist.cpp
View File

@ -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);

2
indra/newview/llsociallist.cpp
View File

@ -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);
}