From 1104e56bc35a95d02644682fcaa1089fa5a2be1b Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 16 Jan 2019 13:23:27 -0800
Subject: [PATCH] fix bug that caused tablet to be constantly hooked and
 unhooked from avatar at SpatiallyNestable level

---
 libraries/avatars/src/AvatarData.h         | 2 --
 libraries/shared/src/SpatiallyNestable.cpp | 3 ++-
 libraries/shared/src/SpatiallyNestable.h   | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index ec5ea4a5d0..bd17233dbf 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -465,8 +465,6 @@ public:
 
     static const QUrl& defaultFullAvatarModelUrl();
 
-    virtual bool isMyAvatar() const { return false; }
-
     const QUuid getSessionUUID() const { return getID(); }
 
     glm::vec3 getHandPosition() const;
diff --git a/libraries/shared/src/SpatiallyNestable.cpp b/libraries/shared/src/SpatiallyNestable.cpp
index 8805205361..c524e3183b 100644
--- a/libraries/shared/src/SpatiallyNestable.cpp
+++ b/libraries/shared/src/SpatiallyNestable.cpp
@@ -108,7 +108,8 @@ SpatiallyNestablePointer SpatiallyNestable::getParentPointer(bool& success) cons
         return nullptr;
     }
 
-    if (parent && parent->getID() == parentID) {
+    if (parent && (parent->getID() == parentID ||
+                   (parentID == AVATAR_SELF_ID && parent->isMyAvatar()))) {
         // parent pointer is up-to-date
         if (!_parentKnowsMe) {
             SpatialParentTree* parentTree = parent->getParentTree();
diff --git a/libraries/shared/src/SpatiallyNestable.h b/libraries/shared/src/SpatiallyNestable.h
index a55f32896b..319f07236b 100644
--- a/libraries/shared/src/SpatiallyNestable.h
+++ b/libraries/shared/src/SpatiallyNestable.h
@@ -47,6 +47,8 @@ public:
     virtual const QUuid getParentID() const;
     virtual void setParentID(const QUuid& parentID);
 
+    virtual bool isMyAvatar() const { return false; }
+
     virtual quint16 getParentJointIndex() const { return _parentJointIndex; }
     virtual void setParentJointIndex(quint16 parentJointIndex);