From 7a222dff1d7fc92f58768e9da574b761316b994b Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 27 Apr 2015 09:54:58 -0700
Subject: [PATCH] move one-liner isEnabled() to header

---
 libraries/physics/src/DynamicCharacterController.cpp | 4 ----
 libraries/physics/src/DynamicCharacterController.h   | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libraries/physics/src/DynamicCharacterController.cpp b/libraries/physics/src/DynamicCharacterController.cpp
index fa1a2d42d1..0bd363dd1f 100644
--- a/libraries/physics/src/DynamicCharacterController.cpp
+++ b/libraries/physics/src/DynamicCharacterController.cpp
@@ -257,10 +257,6 @@ void DynamicCharacterController::setEnabled(bool enabled) {
     }
 }
 
-bool DynamicCharacterController::isEnabled() const { 
-    return _enabled && _dynamicsWorld;
-}
-
 void DynamicCharacterController::setDynamicsWorld(btDynamicsWorld* world) {
     if (_dynamicsWorld != world) {
         if (_dynamicsWorld) { 
diff --git a/libraries/physics/src/DynamicCharacterController.h b/libraries/physics/src/DynamicCharacterController.h
index bd71a8bcdc..06ff555f66 100644
--- a/libraries/physics/src/DynamicCharacterController.h
+++ b/libraries/physics/src/DynamicCharacterController.h
@@ -78,7 +78,8 @@ public:
     bool needsRemoval() const;
     bool needsAddition() const;
     void setEnabled(bool enabled);
-    bool isEnabled() const;
+    bool isEnabled() const { return _enabled && _dynamicsWorld; }
+
     void setDynamicsWorld(btDynamicsWorld* world);
 
     void setLocalBoundingBox(const glm::vec3& corner, const glm::vec3& scale);