Merge pull request #12013 from sethalves/delete-expired-av-ents

when an avatar-entity's lifetime expires, remove it from avatarEntityData
This commit is contained in:
Anthony Thibault 2017-12-18 17:35:42 -08:00 committed by GitHub
commit 7ea1f3b911
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1496,6 +1496,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
}
});
connect(getEntities()->getTree().get(), &EntityTree::deletingEntity, [=](const EntityItemID& entityItemID) {
auto avatarManager = DependencyManager::get<AvatarManager>();
auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
if (myAvatar) {
myAvatar->clearAvatarEntity(entityItemID);
}
});
// Keyboard focus handling for Web overlays.
auto overlays = &(qApp->getOverlays());
connect(overlays, &Overlays::overlayDeleted, [=](const OverlayID& overlayID) {