From 5ee484a5923ff1b1d48a9608d3d6a95cbb279bb1 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 13 Feb 2017 13:36:07 -0800 Subject: [PATCH] don't send avatar localPosition unless the avatar has a parent, even if sendAll is true --- libraries/avatars/src/AvatarData.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 8bb0b38ae5..49a4355301 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -259,9 +259,9 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent // and the parent info can change independently though, so we track their "changed since" // separately bool hasParentInfo = sendAll || parentInfoChangedSince(lastSentTime); - bool hasAvatarLocalPosition = sendAll || - (hasParent() && (tranlationChangedSince(lastSentTime) || - parentInfoChangedSince(lastSentTime))); + bool hasAvatarLocalPosition = hasParent() && (sendAll || + tranlationChangedSince(lastSentTime) || + parentInfoChangedSince(lastSentTime)); bool hasFaceTrackerInfo = hasFaceTracker() && (sendAll || faceTrackerInfoChangedSince(lastSentTime)); bool hasJointData = sendAll || !sendMinimum;