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

Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2018-08-10 19:30:01 -05:00
parent 23228e111c e0df1a763c
commit c8427140bd
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/chatbar_as_cmdline.cpp
View File

@@ -200,16 +200,15 @@ void invrepair()
void resync_anims() void resync_anims()
{ {
for (S32 i = 0; i < gObjectList.getNumObjects(); ++i) for (auto* character : LLCharacter::sInstances)
{ {
LLViewerObject* object = gObjectList.getObject(i); LLVOAvatar& avatar = *static_cast<LLVOAvatar*>(character);
if (object && object->isAvatar()) if (!avatar.isDead())
{ {
LLVOAvatar& avatarp = *(LLVOAvatar*)object; for (const auto& playpair : avatar.mPlayingAnimations)
for (const auto& playpair : avatarp.mPlayingAnimations)
{ {
avatarp.stopMotion(playpair.first, TRUE); avatar.stopMotion(playpair.first, TRUE);
avatarp.startMotion(playpair.first); avatar.startMotion(playpair.first);
} }
} }
} }
@@ -587,18 +586,19 @@ LLUUID cmdline_partial_name2key(std::string partial_name)
std::string av_name; std::string av_name;
LLStringUtil::toLower(partial_name); LLStringUtil::toLower(partial_name);
LLWorld::getInstance()->getAvatars(&avatars); LLWorld::getInstance()->getAvatars(&avatars);
for(std::vector<LLUUID>::const_iterator i = avatars.begin(); i != avatars.end(); ++i) auto* instance(LLFloaterAvatarList::instanceExists() ? LLFloaterAvatarList::instance().getAvatarEntry(*i) : nullptr);
for(const auto& id : avatars)
{ {
if (LLAvatarListEntry* entry = LLFloaterAvatarList::instanceExists() ? LLFloaterAvatarList::instance().getAvatarEntry(*i) : NULL) if (LLAvatarListEntry* entry = radar ? radar->getAvatarEntry(id) : nullptr)
av_name = entry->getName(); av_name = entry->getName();
else if (gCacheName->getFullName(*i, av_name)); else if (gCacheName->getFullName(id, av_name));
else if (LLVOAvatar* avatarp = gObjectList.findAvatar(*i)) else if (LLVOAvatar* avatarp = gObjectList.findAvatar(id))
av_name = avatarp->getFullname(); av_name = avatarp->getFullname();
else else
continue; continue;
LLStringUtil::toLower(av_name); LLStringUtil::toLower(av_name);
if (av_name.find(partial_name) != std::string::npos) if (av_name.find(partial_name) != std::string::npos)
return *i; return id;
} }
return LLUUID::null; return LLUUID::null;
} }