From a177e49877cb97bea92106841b67d90ea26be484 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 21 Aug 2018 12:18:11 -0700
Subject: [PATCH] Revert "send attachment clears through setAvatarEntityData"

This reverts commit 25876bca6397ed1b9036ef5a444beee08e78c02f.
---
 interface/src/AvatarBookmarks.cpp | 15 +++++++++++++--
 interface/src/avatar/MyAvatar.cpp | 19 ++++++++++++++++---
 interface/src/avatar/MyAvatar.h   |  2 +-
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/interface/src/AvatarBookmarks.cpp b/interface/src/AvatarBookmarks.cpp
index c7c87aee3e..6afab71c90 100644
--- a/interface/src/AvatarBookmarks.cpp
+++ b/interface/src/AvatarBookmarks.cpp
@@ -151,7 +151,13 @@ bool isWearableEntity(const EntityItemPointer& entity) {
 
 void AvatarBookmarks::updateAvatarEntities(const QVariantList &avatarEntities) {
     auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-    myAvatar->clearAvatarEntities();
+    auto treeRenderer = DependencyManager::get<EntityTreeRenderer>();
+    EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr;
+    myAvatar->removeAvatarEntities([&](const QUuid& entityID) {
+        auto entity = entityTree->findEntityByID(entityID);
+        return entity && isWearableEntity(entity);
+    });
+
     addAvatarEntities(avatarEntities);
 }
 
@@ -174,7 +180,12 @@ void AvatarBookmarks::loadBookmark(const QString& bookmarkName) {
 
         if (!bookmark.empty()) {
             auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-            myAvatar->clearAvatarEntities();
+            auto treeRenderer = DependencyManager::get<EntityTreeRenderer>();
+            EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr;
+            myAvatar->removeAvatarEntities([&](const QUuid& entityID) {
+                auto entity = entityTree->findEntityByID(entityID);
+                return entity && isWearableEntity(entity);
+            });
             const QString& avatarUrl = bookmark.value(ENTRY_AVATAR_URL, "").toString();
             myAvatar->useFullAvatarURL(avatarUrl);
             qCDebug(interfaceapp) << "Avatar On " << avatarUrl;
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 709ddfd17a..deef69d980 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1703,6 +1703,21 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     emit skeletonChanged();
 }
 
+void MyAvatar::removeAvatarEntities(const std::function<bool(const QUuid& entityID)>& condition) {
+    auto treeRenderer = DependencyManager::get<EntityTreeRenderer>();
+    EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr;
+    if (entityTree) {
+        entityTree->withWriteLock([&] {
+            AvatarEntityMap avatarEntities = getAvatarEntityData();
+            for (auto entityID : avatarEntities.keys()) {
+                if (!condition || condition(entityID)) {
+                    entityTree->deleteEntity(entityID, true, true);
+                }
+            }
+        });
+    }
+}
+
 QVariantList MyAvatar::getAvatarEntitiesVariant() {
     QVariantList avatarEntitiesData;
     QScriptEngine scriptEngine;
@@ -2099,9 +2114,7 @@ void MyAvatar::setAttachmentData(const QVector<AttachmentData>& attachmentData)
         attachmentDataToEntityProperties(data, properties);
         newEntitiesProperties.push_back(properties);
     }
-
-    clearAvatarEntities();
-
+    removeAvatarEntities();
     for (auto& properties : newEntitiesProperties) {
         DependencyManager::get<EntityScriptingInterface>()->addEntity(properties, true);
     }
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 247a0c79c8..ba6348cc22 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -931,7 +931,7 @@ public:
     * @returns {object[]}
     */
     Q_INVOKABLE QVariantList getAvatarEntitiesVariant();
-    void clearAvatarEntities() { setAvatarEntityData(AvatarEntityMap()); }
+    void removeAvatarEntities(const std::function<bool(const QUuid& entityID)>& condition = {});
 
     /**jsdoc
      * @function MyAvatar.isFlying