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

avoid a bootstrap

Browse source
This commit is contained in:
Seth Alves 2016-09-01 17:51:02 -07:00
parent da35281941
commit 8505d1eeed
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2453,7 +2453,8 @@ function MyController(hand) {
// bootstrap themselves with the held object. This happens because the meaning of "otherAvatar" in // bootstrap themselves with the held object. This happens because the meaning of "otherAvatar" in
// the collision mask hinges on who the physics simulation owner is. // the collision mask hinges on who the physics simulation owner is.
Entities.editEntity(entityID, { Entities.editEntity(entityID, {
"collidesWith": removeAvatarsFromCollidesWith(grabbedProperties.collidesWith) // "collidesWith": removeAvatarsFromCollidesWith(grabbedProperties.collidesWith)
collisionless: true
}); });
} }
} }
@ -2712,7 +2713,7 @@ var handleHandMessages = function(channel, message, sender) {
selectedController.nearGrabbingEnter(); selectedController.nearGrabbingEnter();
} catch (e) { } catch (e) {
print("WARNING: error parsing Hifi-Hand-Grab message"); print("WARNING: handControllerGrab.js -- error parsing Hifi-Hand-Grab message: " + message);
} }
} else if (channel === 'Hifi-Hand-RayPick-Blacklist') { } else if (channel === 'Hifi-Hand-RayPick-Blacklist') {
@ -2732,7 +2733,7 @@ var handleHandMessages = function(channel, message, sender) {
} }
} catch (e) { } catch (e) {
print("WARNING: error parsing Hifi-Hand-RayPick-Blacklist message"); print("WARNING: handControllerGrab.js -- error parsing Hifi-Hand-RayPick-Blacklist message: " + message);
} }
} }
} }