From 94bc1764a8d0e79d9091d9d01c5d0569eb524eda Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 12 Feb 2016 06:58:44 -0800 Subject: [PATCH] fix auto-updating of adjustments to worn or equipped entities --- examples/attachedEntitiesManager.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/attachedEntitiesManager.js b/examples/attachedEntitiesManager.js index 7172b456be..4dda76f4df 100644 --- a/examples/attachedEntitiesManager.js +++ b/examples/attachedEntitiesManager.js @@ -144,9 +144,9 @@ function AttachedEntitiesManager() { this.handleEntityRelease = function(grabbedEntity, releasedFromJoint) { // if this is still equipped, just rewrite the position information. - var grabData = getEntityCustomData('grabKey', entityID, {}); + var grabData = getEntityCustomData('grabKey', grabbedEntity, {}); if ("refCount" in grabData && grabData.refCount > 0) { - manager.updateRelativeOffsets(parsedMessage.grabbedEntity); + manager.updateRelativeOffsets(grabbedEntity); return; } @@ -185,8 +185,8 @@ function AttachedEntitiesManager() { parentJointIndex: bestJointIndex }; - if (bestJointOffset && bestJointOffset.constructor === Array && bestJointOffset.length > 1) { - if (this.avatarIsInDressingRoom()) { + if (bestJointOffset && bestJointOffset.constructor === Array) { + if (this.avatarIsInDressingRoom() || bestJointOffset.length < 2) { this.updateRelativeOffsets(grabbedEntity); } else { // don't snap the entity to the preferred position if the avatar is in the dressing room.