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

Make Linden detection more reliable and try to query LLAvatarNameCache first before falling back to old protocol as LLAvatarNameCache is the preferred method of retrieving avatar names

master
Ansariel 2013-07-23 10:08:16 +02:00
parent 580c1e6c2f
commit 080f001f55
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/fscommon.cpp
View File

@ -29,6 +29,7 @@
#include "fscommon.h"
#include "llagent.h"
#include "llavatarnamecache.h"
#include "llfloatersidepanelcontainer.h"
#include "llnotificationmanager.h"
#include "llinventorymodel.h"
@ -265,7 +266,16 @@ bool FSCommon::isLinden(const LLUUID& av_id)
#endif
std::string first_name, last_name;
gCacheName->getFirstLastName(av_id, first_name, last_name);
LLAvatarName av_name;
if (LLAvatarNameCache::get(av_id, &av_name))
{
std::istringstream full_name(av_name.getUserName());
full_name >> first_name >> last_name;
}
else
{
gCacheName->getFirstLastName(av_id, first_name, last_name);
}
return (last_name == LL_LINDEN ||
last_name == LL_MOLE ||