From bb0b51116a8341ced5e3982cb41abe34d271d51d Mon Sep 17 00:00:00 2001
From: milad <milad@miladnazeri.com>
Date: Fri, 6 Sep 2019 11:29:29 -0700
Subject: [PATCH] cr1

---
 .../simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js | 5 +----
 scripts/simplifiedUI/ui/simplifiedUI.js                      | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
index 39af7ffbec..1b16843b09 100644
--- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
+++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
@@ -171,8 +171,6 @@ function onAddingWearable(id) {
     var props = Entities.getEntityProperties(id, ["name"]);
     if (props.name.toLowerCase().indexOf("avimoji") > -1) {
         Entities.deleteEntity(id);
-    } else {
-        return;
     }
 }
 
@@ -235,8 +233,7 @@ function createEmoji(emojiFilename) {
         "billboardMode": "full",
         "ignorePickIntersection": true,
         "alpha": 1,
-        "grab": { "grabbable": false },
-        "userData": JSON.stringify({ timestamp: Date.now() })
+        "grab": { "grabbable": false }
     }, "avatar");
         
     maybePlayPop("in");
diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js
index c388c594c9..affa6896d8 100644
--- a/scripts/simplifiedUI/ui/simplifiedUI.js
+++ b/scripts/simplifiedUI/ui/simplifiedUI.js
@@ -584,7 +584,7 @@ function restoreLODSettings() {
 
 
 var nametag = Script.require("./simplifiedNametag/simplifiedNametag.js?" + Date.now());
-var si = Script.require("./simplifiedStatusIndicator/simplifiedStatusIndicator.js?" + Date.now())
+var si = Script.require("./simplifiedStatusIndicator/simplifiedStatusIndicator.js?" + Date.now());
 var emote = Script.require("../simplifiedEmote/simplifiedEmote.js?" + Date.now());
 var oldShowAudioTools;
 var oldShowBubbleTools;