Merge pull request #13749 from samcake/punk

Fix the other avatars not being removed when Avatar mixer reset
This commit is contained in:
Sam Gateau 2018-08-03 15:37:13 -07:00 committed by GitHub
commit aac4ff0b7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -412,9 +412,6 @@ void AvatarManager::clearOtherAvatars() {
while (avatarIterator != _avatarHash.end()) {
auto avatar = std::static_pointer_cast<Avatar>(avatarIterator.value());
if (avatar != _myAvatar) {
if (avatar->isInScene()) {
avatar->removeFromScene(avatar, scene, transaction);
}
handleRemovedAvatar(avatar);
avatarIterator = _avatarHash.erase(avatarIterator);
} else {