From fa77441fda8c96c52d413d4cf2a226c2b402cd80 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 11 Mar 2021 20:19:38 +1300
Subject: [PATCH] Fix avatar entity not disappearing from other users' view

---
 interface/src/avatar/MyAvatar.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 84bf17d8c6..97ca59f617 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1536,12 +1536,14 @@ void MyAvatar::storeAvatarEntityDataPayload(const QUuid& entityID, const QByteAr
 
 void MyAvatar::clearAvatarEntity(const QUuid& entityID, bool requiresRemovalFromTree) {
     // NOTE: the requiresRemovalFromTree argument is unused
+
+    AvatarData::clearAvatarEntity(entityID);
+
     if (!DependencyManager::get<NodeList>()->getThisNodeCanRezAvatarEntities()) {
-        // Don't delete potentially non-rezzed avatar entities, otherwise they're removed from settings.
+        // Don't delete potentially non-rezzed avatar entities from cache, otherwise they're removed from settings.
         return;
     }
 
-    AvatarData::clearAvatarEntity(entityID);
     _avatarEntitiesLock.withWriteLock([&] {
         _cachedAvatarEntityBlobsToDelete.push_back(entityID);
     });