From eedc5c1647cc9f8095fde848a24b9e9e7b46842c Mon Sep 17 00:00:00 2001
From: Seth Alves <seth@highfidelity.io>
Date: Fri, 24 Feb 2017 12:10:52 -0800
Subject: [PATCH] don't allow tablet to get stuck to a hand when passing it
 back and forth between hands

---
 libraries/entities/src/EntityScriptingInterface.cpp | 3 +--
 scripts/system/controllers/handControllerGrab.js    | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index cd7f1235bb..a5bd0135e4 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -1419,8 +1419,7 @@ QVector<QUuid> EntityScriptingInterface::getChildrenIDsOfJoint(const QUuid& pare
             return;
         }
         parent->forEachChild([&](SpatiallyNestablePointer child) {
-            if (child->getParentJointIndex() == jointIndex &&
-                child->getNestableType() != NestableType::Overlay) {
+            if (child->getParentJointIndex() == jointIndex) {
                 result.push_back(child->getID());
             }
         });
diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 7863d5a27c..d313d1cfa1 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -3213,9 +3213,13 @@ function MyController(hand) {
                     }
                     _this.previouslyUnhooked[childID] = now;
 
+                    // we don't know if it's an entity or an overlay
                     Entities.editEntity(childID, { parentID: previousParentID, parentJointIndex: previousParentJointIndex });
+                    Overlays.editOverlay(childID, { parentID: previousParentID, parentJointIndex: previousParentJointIndex });
+
                 } else {
                     Entities.editEntity(childID, { parentID: NULL_UUID });
+                    Overlays.editOverlay(childID, { parentID: NULL_UUID });
                 }
             }
         });