Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 16:55:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clear timeout one more place

Browse source
This commit is contained in:
James B. Pollack 2016-08-02 14:42:21 -07:00
parent 41aa485f11
commit f6984aaff8
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scripts/system/controllers/handControllerPointer.js
View file

@ -509,3 +509,27 @@ Script.scriptEnding.connect(function () {
OffscreenFlags.navigationFocusDisabled = false;
});
var isDisabled = false;
var handleHandMessages = function(channel, message, sender) {
var data;
if (sender === MyAvatar.sessionUUID) {
if (channel === 'Hifi-Hand-Pointer-Disabler') {
if (message === 'both') {
isDisabled = 'both';
}
if (message === 'left') {
isDisabled = 'left';
}
if (message === 'right') {
isDisabled = 'right'
}
if (message === 'none') {
isDisabled = false;
}
}
}
}
Messages.subscribe('Hifi-Hand-Pointer-Disabler');
Messages.messageReceived.connect(handleHandMessages);

4
scripts/system/controllers/teleport.js
View file

@ -221,13 +221,15 @@ function Teleporter() {
}
this.exitTeleportMode = function(value) {
if(activationTimeout!==null){
Script.clearTimeout(activationTimeout);
}
if (this.updateConnected === true) {
Script.update.disconnect(this.update);
}
this.disableMappings();
this.turnOffOverlayBeams();
this.updateConnected = null;
Script.setTimeout(function() {