Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:49:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

One last gotcha from the conflict resolution.

Browse source
This commit is contained in:
Matti Lahtinen 2017-02-28 16:37:08 +02:00 committed by GitHub
parent e21785d5ec
commit d0c2c26a8e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/system/controllers/handControllerGrab.js
View file

@ -2497,7 +2497,7 @@ function MyController(hand) {
cProperties.lifetime = lifetime; cProperties.lifetime = lifetime;
cProperties.userData = JSON.stringify(cUserData); cProperties.userData = JSON.stringify(cUserData);
this.grabbedThingID = Entities.addEntity(cProperties); this.grabbedThingID = Entities.addEntity(cProperties);
grabbedProperties = Entities.getEntityProperties(this.grabbedEntity); grabbedProperties = Entities.getEntityProperties(this.grabbedThingID);
var _this = this; var _this = this;
Script.setTimeout(function () { Script.setTimeout(function () {