From dcc13b447cbc1b2b4affa6b5373b7747f673f1a5 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Fri, 10 Aug 2018 23:07:27 -0500 Subject: [PATCH] Fix compile post liru merge. --- indra/newview/chatbar_as_cmdline.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/chatbar_as_cmdline.cpp b/indra/newview/chatbar_as_cmdline.cpp index 097ce7752..c03d8424c 100644 --- a/indra/newview/chatbar_as_cmdline.cpp +++ b/indra/newview/chatbar_as_cmdline.cpp @@ -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))