From 0500c21e0067f9ff5f68e49d34621d7cdf1296da Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 16 Dec 2015 16:09:52 -0800
Subject: [PATCH] unmangle merge

---
 libraries/avatars/src/AvatarData.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 3301b97942..ecf9947979 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -90,10 +90,13 @@ const QUrl& AvatarData::defaultFullAvatarModelUrl() {
 // There are a number of possible strategies for this set of tools through endRender, below.
 void AvatarData::nextAttitude(glm::vec3 position, glm::quat orientation) {
     avatarLock.lock();
-    Transform trans = getTransform();
+    bool success;
+    Transform trans = getTransform(success);
+    if (!success) {
+        return;
+    }
     trans.setTranslation(position);
     trans.setRotation(orientation);
-    bool success;
     SpatiallyNestable::setTransform(trans, success);
     if (!success) {
         qDebug() << "Warning -- AvatarData::nextAttitude failed";