Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avatar Picker's list of friends should use the friends name system.

Browse Source
This commit is contained in:
Inusaito Sayori
2014-10-18 15:05:10 -04:00
parent 0d300776ca
commit 341ca20529
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llcallingcard.cpp
View File

@@ -895,11 +895,10 @@ bool LLCollectOnlineBuddies::operator()(const LLUUID& buddy_id, LLRelationship*
return true; return true;
} }
const S32& friend_name_system();
bool LLCollectAllBuddies::operator()(const LLUUID& buddy_id, LLRelationship* buddy) bool LLCollectAllBuddies::operator()(const LLUUID& buddy_id, LLRelationship* buddy)
{ {
LLAvatarName av_name; LLAvatarNameCache::getPNSName(buddy_id, mFullName, friend_name_system());
LLAvatarNameCache::get(buddy_id, &av_name);
mFullName = av_name.mDisplayName;
buddy_map_t::value_type value(mFullName, buddy_id); buddy_map_t::value_type value(mFullName, buddy_id);
if(buddy->isOnline()) if(buddy->isOnline())
{ {

2
indra/newview/llfloateravatarpicker.cpp
View File

@@ -378,7 +378,7 @@ void LLFloaterAvatarPicker::populateFriend()
} }
for(it = collector.mOffline.begin(); it!=collector.mOffline.end(); it++) for(it = collector.mOffline.begin(); it!=collector.mOffline.end(); it++)
{ {
friends_scroller->addStringUUIDItem(it->first, it->second); friends_scroller->addStringUUIDItem(it->first, it->second);
} }
friends_scroller->sortByColumnIndex(0, TRUE); friends_scroller->sortByColumnIndex(0, TRUE);
} }

2
indra/newview/llfloaterfriends.cpp
View File

@@ -322,7 +322,7 @@ BOOL LLPanelFriends::postBuild()
return true; return true;
} }
static const S32& friend_name_system() const S32& friend_name_system()
{ {
static const LLCachedControl<S32> name_system("FriendNameSystem", 0); static const LLCachedControl<S32> name_system("FriendNameSystem", 0);
return name_system; return name_system;