From b9f0af63e1e52837cd2e692bade3084b1c71a0c5 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Wed, 12 Sep 2018 10:38:21 -0700
Subject: [PATCH] changing check for near grabbing modules - fixes grabbing for
 dynamic

---
 .../controllerModules/webSurfaceLaserInput.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/scripts/system/controllers/controllerModules/webSurfaceLaserInput.js b/scripts/system/controllers/controllerModules/webSurfaceLaserInput.js
index 3ae971cf70..bd9d5f97e4 100644
--- a/scripts/system/controllers/controllerModules/webSurfaceLaserInput.js
+++ b/scripts/system/controllers/controllerModules/webSurfaceLaserInput.js
@@ -49,12 +49,19 @@ Script.include("/~/system/libraries/controllers.js");
                 nearGrabName = this.hand === RIGHT_HAND ? "RightNearParentingGrabEntity" : "LeftNearParentingGrabEntity";
                 nearGrabModule = getEnabledModuleByName(nearGrabName);
                 if (nearGrabModule && nearGrabModule.isReady(controllerData)) {
-                    return nearGrabModule.isReady(controllerData).active;
-                }
-                nearGrabName = this.hand === RIGHT_HAND ? "RightNearActionGrabEntity" : "LeftNearActionGrabEntity";
-                nearGrabModule = getEnabledModuleByName(nearGrabName);
-                if (nearGrabModule && nearGrabModule.isReady(controllerData)) {
-                    return nearGrabModule.isReady(controllerData).active;
+                    // check for if near parent module is active.
+                    var isNearGrabModuleActive = nearGrabModule.isReady(controllerData).active;
+                    if (isNearGrabModuleActive) {
+                        // if true, return true.
+                        return isNearGrabModuleActive;
+                    } else {
+                        // check near action grab entity as a second pass.
+                        nearGrabName = this.hand === RIGHT_HAND ? "RightNearActionGrabEntity" : "LeftNearActionGrabEntity";
+                        nearGrabModule = getEnabledModuleByName(nearGrabName);
+                        if (nearGrabModule && nearGrabModule.isReady(controllerData)) {
+                            return nearGrabModule.isReady(controllerData).active;
+                        }
+                    }
                 }
             }
             return false;