Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 18:03:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cr1

Browse source
This commit is contained in:
milad 2019-09-06 11:29:29 -07:00
parent b352d53083
commit bb0b51116a
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
View file

@ -171,8 +171,6 @@ function onAddingWearable(id) {
var props = Entities.getEntityProperties(id, ["name"]); var props = Entities.getEntityProperties(id, ["name"]);
if (props.name.toLowerCase().indexOf("avimoji") > -1) { if (props.name.toLowerCase().indexOf("avimoji") > -1) {
Entities.deleteEntity(id); Entities.deleteEntity(id);
} else {
return;
} }
} }
@ -235,8 +233,7 @@ function createEmoji(emojiFilename) {
"billboardMode": "full", "billboardMode": "full",
"ignorePickIntersection": true, "ignorePickIntersection": true,
"alpha": 1, "alpha": 1,
"grab": { "grabbable": false }, "grab": { "grabbable": false }
"userData": JSON.stringify({ timestamp: Date.now() })
}, "avatar"); }, "avatar");
maybePlayPop("in"); maybePlayPop("in");

2
scripts/simplifiedUI/ui/simplifiedUI.js
View file

@ -584,7 +584,7 @@ function restoreLODSettings() {
var nametag = Script.require("./simplifiedNametag/simplifiedNametag.js?" + Date.now()); 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 emote = Script.require("../simplifiedEmote/simplifiedEmote.js?" + Date.now());
var oldShowAudioTools; var oldShowAudioTools;
var oldShowBubbleTools; var oldShowBubbleTools;