From 86b551c177e05f49b08dab988e89327588678863 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sun, 3 Jan 2016 07:33:50 -0800
Subject: [PATCH] back out off-brand change

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

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