From db955d894f6bd64980e7b458e35c8887d9442a72 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Tue, 6 Oct 2015 14:52:53 -0700
Subject: [PATCH] Align avatar body to head on reset.

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

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 9654305d70..82a2231a61 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -141,6 +141,7 @@ QByteArray MyAvatar::toByteArray(bool cullSmallChanges, bool sendAll) {
 
 void MyAvatar::reset() {
     _skeletonModel.reset();
+    float headYaw = getHead()->getBaseYaw(); // degrees
     getHead()->reset();
 
     _targetVelocity = glm::vec3(0.0f);
@@ -148,6 +149,7 @@ void MyAvatar::reset() {
     //  Reset the pitch and roll components of the avatar's orientation, preserve yaw direction
     glm::vec3 eulers = safeEulerAngles(getOrientation());
     eulers.x = 0.0f;
+    eulers.y += headYaw; // align body with head
     eulers.z = 0.0f;
     setOrientation(glm::quat(eulers));