From a35e527128e54c254ee53c963e9e0beef7876111 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth@highfidelity.io>
Date: Thu, 1 Sep 2016 11:46:08 -0700
Subject: [PATCH] try to fix far-trigger

---
 scripts/system/controllers/handControllerGrab.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 532adf8de2..a35207ad11 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -2044,7 +2044,7 @@ function MyController(hand) {
         var props = Entities.getEntityProperties(this.grabbedEntity, ["localPosition", "parentID",
                                                                       "position", "rotation", "dimensions"]);
         if (!props.position) {
-            // server may have reset, taking our equipped entity with it.  move back to "off" stte
+            // server may have reset, taking our equipped entity with it.  move back to "off" state
             this.callEntityMethodOnGrabbed("releaseGrab");
             this.setState(STATE_OFF, "entity has no position property");
             return;
@@ -2175,10 +2175,9 @@ function MyController(hand) {
             return;
         }
 
-        var handPosition = this.getHandPosition();
         var pickRay = {
-            origin: handPosition,
-            direction: Quat.getUp(this.getControllerRotation())
+            origin: this.getControllerLocation().position,
+            direction: Quat.getUp(this.getControllerLocation().orientation)
         };
 
         var now = Date.now();