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

svn merge svn+ssh://svn/svn/linden/branches/maintenance -r 59998:59999 into release 

Fix for groups showing up as 'nobody'
master
Don Kjer 2007-04-04 22:29:45 +00:00
parent 98740db8fd
commit 170d61d200
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llnamelistctrl.cpp
View File

@ -175,13 +175,21 @@ LLScrollListItem* LLNameListCtrl::addElement(const LLSD& value, EAddPosition pos
char first[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
char last[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
gCacheName->getName(item->getUUID(), first, last);
LLString fullname;
fullname.assign(first);
fullname.append(1, ' ');
fullname.append(last);
if (gCacheName->getName(item->getUUID(), first, last))
{
fullname.assign(first);
fullname.append(1, ' ');
fullname.append(last);
}
else // didn't work as a resident name, try looking up as a group
{
char group_name[DB_GROUP_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
gCacheName->getGroupName(item->getUUID(), group_name);
// fullname will be "nobody" if group not found
fullname = group_name;
}
LLScrollListCell* cell = (LLScrollListCell*)item->getColumn(mNameColumnIndex);
((LLScrollListText*)cell)->setText( fullname );