From 41f7ef1e2e52bff69c0c9879560bfa13dfe9be85 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 19 Oct 2015 16:53:27 -0700
Subject: [PATCH] cleanups

---
 examples/controllers/handControllerGrab.js | 6 ++----
 interface/src/avatar/AvatarActionHold.cpp  | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/examples/controllers/handControllerGrab.js b/examples/controllers/handControllerGrab.js
index 78f648f445..1e77125d00 100644
--- a/examples/controllers/handControllerGrab.js
+++ b/examples/controllers/handControllerGrab.js
@@ -497,8 +497,7 @@ function MyController(hand, triggerAction) {
             timeScale: NEAR_GRABBING_ACTION_TIMEFRAME,
             relativePosition: this.offsetPosition,
             relativeRotation: this.offsetRotation,
-            lifetime: ACTION_LIFETIME,
-            // kinematic: true,
+            lifetime: ACTION_LIFETIME
         });
         if (this.actionID === NULL_ACTION_ID) {
             this.actionID = null;
@@ -550,8 +549,7 @@ function MyController(hand, triggerAction) {
                 timeScale: NEAR_GRABBING_ACTION_TIMEFRAME,
                 relativePosition: this.offsetPosition,
                 relativeRotation: this.offsetRotation,
-                lifetime: ACTION_LIFETIME,
-                // kinematic: true
+                lifetime: ACTION_LIFETIME
             });
             this.actionTimeout = now + (ACTION_LIFETIME * MSEC_PER_SEC);
         }
diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp
index 4d07ecb5e3..cf455ea98c 100644
--- a/interface/src/avatar/AvatarActionHold.cpp
+++ b/interface/src/avatar/AvatarActionHold.cpp
@@ -175,7 +175,7 @@ bool AvatarActionHold::updateArguments(QVariantMap arguments) {
 
         ok = true;
         kinematicSetVelocity = EntityActionInterface::extractBooleanArgument("hold", arguments,
-                                                                             "kinematic-set-velocity", ok, false);
+                                                                             "kinematicSetVelocity", ok, false);
         if (!ok) {
             _kinematicSetVelocity = false;
         }