From 6af21525d5040ebcb3360c165b94d191d137b99a Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Sun, 30 Apr 2017 14:19:33 -0700
Subject: [PATCH] remove extra joint search

---
 scripts/system/makeUserConnection.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/scripts/system/makeUserConnection.js b/scripts/system/makeUserConnection.js
index eabd4d5dac..0faaf00ded 100644
--- a/scripts/system/makeUserConnection.js
+++ b/scripts/system/makeUserConnection.js
@@ -399,14 +399,12 @@
         }
     }
 
-    function isNearby(id, handString) {
+    function isNearby() {
         if (currentHand) {
             var handPosition = getHandPosition(MyAvatar, currentHandJointIndex);
-            var avatar = AvatarList.getAvatar(id);
+            var avatar = AvatarList.getAvatar(connectingId);
             if (avatar) {
-                var otherHand = stringToHand(handString);
-                var otherHandJointIndex = getIdealHandJointIndex(avatar, otherHand);
-                var distance = Vec3.distance(getHandPosition(avatar, otherHandJointIndex), handPosition);
+                var distance = Vec3.distance(getHandPosition(avatar, connectingHandJointIndex), handPosition);
                 return (distance < MAX_AVATAR_DISTANCE);
             }
         }
@@ -728,7 +726,7 @@
             if (state !== STATES.CONNECTING) {
                 debug("stopping connecting interval, state changed");
                 stopConnecting();
-            } else if (!isNearby(id, handString)) {
+            } else if (!isNearby()) {
                 // gotta go back to waiting
                 debug(id, "moved, back to waiting");
                 stopConnecting();
@@ -800,9 +798,8 @@
             delete waitingList[senderID];
             if (state === STATES.WAITING && (!connectingId || connectingId === senderID)) {
                 if (message.id === MyAvatar.sessionUUID) {
-                    setupConnecting(senderID, message[HAND_STRING_PROPERTY]);
                     stopWaiting();
-                    startConnecting(senderID, connectingHandString);
+                    startConnecting(senderID, message[HAND_STRING_PROPERTY]);
                 } else if (connectingId) {
                     // this is for someone else (we lost race in connectionRequest),
                     // so lets start over