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

Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Browse Source
This commit is contained in:
Lirusaito
2012-07-08 17:10:44 -04:00
parent 1228732432 95b0421074
commit b8f7e193d6
1 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llpanelgroupinvite.cpp
View File

@@ -392,27 +392,9 @@ void LLPanelGroupInvite::addUsers(std::vector<LLUUID>& agent_ids)
std::vector<std::string> names;
for (S32 i = 0; i < (S32)agent_ids.size(); i++)
{
LLUUID agent_id = agent_ids[i];
LLVOAvatar* avatarp = gObjectList.findAvatar(agent_id);
if(avatarp)
{
std::string fullname;
LLNameValue* nvfirst = avatarp->getNVPair("FirstName");
LLNameValue* nvlast = avatarp->getNVPair("LastName");
if(nvfirst && nvlast)
{
fullname = std::string(nvfirst->getString()) + " " + std::string(nvlast->getString());
}
if (!fullname.empty())
{
names.push_back(fullname);
}
else
{
llwarns << "llPanelGroupInvite: Selected avatar has no name: " << avatarp->getID() << llendl;
names.push_back("(Unknown)");
}
}
std::string name;
if(gCacheName->getFullName(agent_ids[i], name))
names.push_back(name);
}
mImplementation->addUsers(names, agent_ids);
}