From 61e4155eda831e560b53961c1237e97a96be06c9 Mon Sep 17 00:00:00 2001
From: Milad Nazeri <milad@miladnazeri.com>
Date: Wed, 19 Jun 2019 07:30:28 -0700
Subject: [PATCH] cr-r1

---
 .../resources/modules/nameTagListManager.js                | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/simplifiedUI/ui/simplifiedNametag/resources/modules/nameTagListManager.js b/scripts/simplifiedUI/ui/simplifiedNametag/resources/modules/nameTagListManager.js
index d7bb56be64..2ba9904845 100644
--- a/scripts/simplifiedUI/ui/simplifiedNametag/resources/modules/nameTagListManager.js
+++ b/scripts/simplifiedUI/ui/simplifiedNametag/resources/modules/nameTagListManager.js
@@ -156,11 +156,11 @@ function getDistance(uuid, checkAvatar, shouldSave) {
 
 // Quick check for distance from avatar
 function quickDistanceCheckForNonSelectedAvatars(uuid) {
-    var eye = MyAvatar.position;
+    var source = MyAvatar.position;
 
     var target = AvatarManager.getAvatar(uuid).position;
 
-    var avatarDistance = Vec3.distance(target, eye);
+    var avatarDistance = Vec3.distance(target, source);
 
     return avatarDistance;
 }
@@ -211,6 +211,7 @@ function handleAlwaysOnMode(shouldTurnOnAlwaysOnMode) {
                     }
                 }
             });
+        maybeClearAlwaysOnAvatarDistanceCheck();
         alwaysOnAvatarDistanceCheck = Script.setInterval(maybeAddOrRemoveIntervalCheck, DISTANCE_CHECK_INTERVAL_MS);
     }
 }
@@ -549,7 +550,7 @@ function create() {
 }
 
 
-// Destory the manager
+// Destroy the manager
 function destroy() {
     _this.reset();