From e7fa8131eaf3457596cfebeff5a5d50404d82ce3 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 2 Oct 2017 16:44:03 -0700
Subject: [PATCH] make json importer understand AVATAR_SELF_ID

---
 libraries/entities/src/EntityTree.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 445f2ddb38..e0187cd2b6 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1935,11 +1935,14 @@ bool EntityTree::readFromMap(QVariantMap& map) {
             entityItemID = EntityItemID(QUuid::createUuid());
         }
 
+        auto nodeList = DependencyManager::get<NodeList>();
+        const QUuid myNodeID = nodeList->getSessionUUID();
         if (properties.getClientOnly()) {
-            auto nodeList = DependencyManager::get<NodeList>();
-            const QUuid myNodeID = nodeList->getSessionUUID();
             properties.setOwningAvatarID(myNodeID);
         }
+        if (properties.getParentID() == AVATAR_SELF_ID) {
+            properties.setParentID(myNodeID);
+        }
 
         EntityItemPointer entity = addEntity(entityItemID, properties);
         if (!entity) {