From c05225ca2f4e8d35449a50f5e2b0a42ac61234b9 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 26 May 2020 14:58:13 +1200
Subject: [PATCH] Reinstate nearParentGrabOverlay controller module

Fixes regression where tablet becomes large when grabbed if avatar is
small.
---
 scripts/system/controllers/controllerDispatcher.js | 1 -
 scripts/system/controllers/controllerScripts.js    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js
index de583b8f0c..5af86d3bbd 100644
--- a/scripts/system/controllers/controllerDispatcher.js
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -323,7 +323,6 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
                     }
 
                     var nearbyEntityIDs = Entities.findEntities(controllerPosition, findRadius);
-                    nearbyEntityIDs = nearbyEntityIDs.concat(nearbyOverlayIDs[h]); // overlays are now entities
 
                     for (var j = 0; j < nearbyEntityIDs.length; j++) {
                         var entityID = nearbyEntityIDs[j];
diff --git a/scripts/system/controllers/controllerScripts.js b/scripts/system/controllers/controllerScripts.js
index f41dcbd445..fb422ebdf7 100644
--- a/scripts/system/controllers/controllerScripts.js
+++ b/scripts/system/controllers/controllerScripts.js
@@ -18,6 +18,7 @@ var CONTOLLER_SCRIPTS = [
     //"toggleAdvancedMovementForHandControllers.js",
     "handTouch.js",
     "controllerDispatcher.js",
+    "controllerModules/nearParentGrabOverlay.js",
     "controllerModules/stylusInput.js",
     "controllerModules/equipEntity.js",
     "controllerModules/nearTrigger.js",