From 9cf94c968aa7a5e02a0d44b50dbb8b068439a9c4 Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Wed, 3 Oct 2018 02:55:33 +0300
Subject: [PATCH] FB18573 - Other avatars' avatar entities may appear to be
 successfully deleted until edited

note: partially revert commit 888f2f64a5971b18c0dbcdac2b15d83c14deac45 / "Merge pull request #10981 from druiz17/bug/delete-avatar-entity
---
 libraries/entities/src/EntityScriptingInterface.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 22eb57e051..7b9b6a8cba 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -712,11 +712,6 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
                 const QUuid myNodeID = nodeList->getSessionUUID();
                 if (entity->getClientOnly() && entity->getOwningAvatarID() != myNodeID) {
                     // don't delete other avatar's avatarEntities
-                    // If you actually own the entity but the onwership property is not set because of a domain switch
-                    // The lines below makes sure the entity is deleted once its properties are set.
-                    auto avatarHashMap = DependencyManager::get<AvatarHashMap>();
-                    AvatarSharedPointer myAvatar = avatarHashMap->getAvatarBySessionID(myNodeID);
-                    myAvatar->insertDetachedEntityID(id);
                     shouldSendDeleteToServer = false;
                     return;
                 }