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

Fix compile post liru merge.

Browse Source
This commit is contained in:
Shyotl
2018-08-10 23:07:27 -05:00
parent 5d2eb3e4cf
commit dcc13b447c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/chatbar_as_cmdline.cpp
View File

@@ -586,10 +586,10 @@ LLUUID cmdline_partial_name2key(std::string partial_name)
std::string av_name;
LLStringUtil::toLower(partial_name);
LLWorld::getInstance()->getAvatars(&avatars);
auto* instance(LLFloaterAvatarList::instanceExists() ? LLFloaterAvatarList::instance().getAvatarEntry(*i) : nullptr);
auto instance = (LLFloaterAvatarList::instanceExists() ? &LLFloaterAvatarList::instance() : nullptr);
for(const auto& id : avatars)
{
if (LLAvatarListEntry* entry = radar ? radar->getAvatarEntry(id) : nullptr)
if (LLAvatarListEntry* entry = instance ? instance->getAvatarEntry(id) : nullptr)
av_name = entry->getName();
else if (gCacheName->getFullName(id, av_name));
else if (LLVOAvatar* avatarp = gObjectList.findAvatar(id))