From 0c489e3afd6e93ff3170022e27514a02b9def1dc Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Fri, 9 Oct 2015 14:46:05 -0700
Subject: [PATCH] MyAvatar: Rename new instance variable after merge.

---
 interface/src/avatar/MyAvatar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index a02fd4fee1..22816e9001 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -152,7 +152,7 @@ void MyAvatar::reset() {
     setEnableRigAnimations(true);
 
     // Reset dynamic state.
-    _wasPushing = _isPushing = _isBraking = _billboardValid = _goToPending = _straightingLean = false;
+    _wasPushing = _isPushing = _isBraking = _billboardValid = _goToPending = _straighteningLean = false;
     _skeletonModel.reset();
     getHead()->reset();
     _targetVelocity = glm::vec3(0.0f);