From 5d0604b8d31f1f8c81e7e3a911f86d2bbc07e79f Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sun, 3 Jan 2016 07:33:10 -0800
Subject: [PATCH] activateBody doesn't help if called from inside the action
 callback, because the callback isn't called on inactive bodies.  call it from
 the setup routine, instead

---
 interface/src/avatar/AvatarActionHold.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp
index 689d557c48..4dda14e194 100644
--- a/interface/src/avatar/AvatarActionHold.cpp
+++ b/interface/src/avatar/AvatarActionHold.cpp
@@ -89,6 +89,8 @@ void AvatarActionHold::prepareForPhysicsSimulation() {
         // code here for future reference.
         // _palmRotationFromRigidBody = avatarRotationInverse * palmRotation;
     });
+
+    activateBody();
 }
 
 std::shared_ptr<Avatar> AvatarActionHold::getTarget(glm::quat& rotation, glm::vec3& position) {
@@ -197,7 +199,6 @@ void AvatarActionHold::updateActionWorker(float deltaTimeStep) {
         if (_kinematic) {
             doKinematicUpdate(deltaTimeStep);
         } else {
-            activateBody();
             forceBodyNonStatic();
             ObjectActionSpring::updateActionWorker(deltaTimeStep);
         }
@@ -247,7 +248,6 @@ void AvatarActionHold::doKinematicUpdate(float deltaTimeStep) {
         _previousSet = true;
     });
 
-    activateBody();
     forceBodyNonStatic();
 }
 
@@ -344,7 +344,6 @@ bool AvatarActionHold::updateArguments(QVariantMap arguments) {
                 ownerEntity->setActionDataNeedsTransmit(true);
             }
         });
-        activateBody();
     }
 
     return true;
@@ -431,6 +430,5 @@ void AvatarActionHold::deserialize(QByteArray serializedArguments) {
         _active = true;
     });
 
-    activateBody();
     forceBodyNonStatic();
 }