From 72867437be52761ba04c8d2670a7b773da27d3df Mon Sep 17 00:00:00 2001
From: milad <milad@miladnazeri.com>
Date: Tue, 25 Jun 2019 15:38:02 -0700
Subject: [PATCH] updated lifetime

---
 .../resources/modules/nameTagListManager.js               | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/simplifiedUI/ui/simplifiedNametag/resources/modules/nameTagListManager.js b/scripts/simplifiedUI/ui/simplifiedNametag/resources/modules/nameTagListManager.js
index 2ba9904845..de783f8661 100644
--- a/scripts/simplifiedUI/ui/simplifiedNametag/resources/modules/nameTagListManager.js
+++ b/scripts/simplifiedUI/ui/simplifiedNametag/resources/modules/nameTagListManager.js
@@ -19,7 +19,8 @@ var HALF = 0.5;
 var CLEAR_ENTITY_EDIT_PROPS = true;
 var MILISECONDS_IN_SECOND = 1000;
 var SECONDS_IN_MINUTE = 60;
-var ALWAYS_ON_MAX_LIFETIME_IN_SECONDS = 20 * SECONDS_IN_MINUTE; // Delete after 20 minutes in case a nametag is hanging around in on mode 
+// Delete after 5 minutes in case a nametag is hanging around in on mode 
+var ALWAYS_ON_MAX_LIFETIME_IN_SECONDS = 5 * SECONDS_IN_MINUTE;
 
 // *************************************
 // START UTILTY
@@ -377,6 +378,11 @@ function maybeAddOrRemoveIntervalCheck() {
                     add(avatar);
                     return;
                 }
+                if (avatar in _this.avatars) {
+                    var entity = _this.avatars[avatar].nametag;
+                    var age = entity.get("age");
+                    entity.edit('lifetime', age + ALWAYS_ON_MAX_LIFETIME_IN_SECONDS);
+                }
                 if (avatarDistance > MAX_RADIUS_IGNORE_METERS) {
                     maybeRemove(avatar);
                 }