From 6471780e210e52cac921c02cdc1bbafcde4e8575 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 8 Feb 2018 17:17:04 -0800
Subject: [PATCH] allow overlay children to follow avatar from one domain to
 another

---
 interface/src/ui/overlays/Base3DOverlay.cpp | 2 ++
 interface/src/ui/overlays/Line3DOverlay.cpp | 2 +-
 libraries/avatars/src/AvatarData.h          | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/interface/src/ui/overlays/Base3DOverlay.cpp b/interface/src/ui/overlays/Base3DOverlay.cpp
index 23e09fe5ca..ff5a202910 100644
--- a/interface/src/ui/overlays/Base3DOverlay.cpp
+++ b/interface/src/ui/overlays/Base3DOverlay.cpp
@@ -181,6 +181,8 @@ void Base3DOverlay::setProperties(const QVariantMap& originalProperties) {
 
     if (properties["parentID"].isValid()) {
         setParentID(QUuid(properties["parentID"].toString()));
+        bool success;
+        getParentPointer(success); // call this to hook-up the parent's back-pointers to its child overlays
         needRenderItemUpdate = true;
     }
     if (properties["parentJointIndex"].isValid()) {
diff --git a/interface/src/ui/overlays/Line3DOverlay.cpp b/interface/src/ui/overlays/Line3DOverlay.cpp
index 7200abf74e..c2e5ad1fb4 100644
--- a/interface/src/ui/overlays/Line3DOverlay.cpp
+++ b/interface/src/ui/overlays/Line3DOverlay.cpp
@@ -63,7 +63,7 @@ glm::vec3 Line3DOverlay::getEnd() const {
     localEnd = getLocalEnd();
     worldEnd = localToWorld(localEnd, getParentID(), getParentJointIndex(), getScalesWithParent(), success);
     if (!success) {
-        qDebug() << "Line3DOverlay::getEnd failed";
+        qDebug() << "Line3DOverlay::getEnd failed, parentID = " << getParentID();
     }
     return worldEnd;
 }
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index a363fb6d15..f24bd51bde 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -707,7 +707,11 @@ public slots:
     void setJointMappingsFromNetworkReply();
     void setSessionUUID(const QUuid& sessionUUID) {
         if (sessionUUID != getID()) {
-            setID(sessionUUID);
+            if (sessionUUID == QUuid()) {
+                setID(AVATAR_SELF_ID);
+            } else {
+                setID(sessionUUID);
+            }
             emit sessionUUIDChanged();
         }
     }