From e792e8eecfcf7e4565090720fd332c55d285f222 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Wed, 18 May 2016 16:05:16 -0700 Subject: [PATCH] Fix for identity packet pong --- libraries/avatars/src/AvatarData.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 09ea34a5c4..e5fe31217f 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -606,7 +606,6 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) { // joint rotations int numJoints = *sourceBuffer++; - // do not process any jointData until we've received a valid jointIndices hash from // an earlier AvatarIdentity packet. Because if we do, we risk applying the joint data // the wrong bones, resulting in a twisted avatar, An un-animated avatar is preferable to this. @@ -1034,22 +1033,21 @@ QByteArray AvatarData::identityByteArray() { const QUrl& urlToSend = _skeletonModelURL.scheme() == "file" ? emptyURL : _skeletonModelURL; #ifdef TRANSMIT_JOINT_INDICES_IN_IDENTITY_PACKET - identityStream << QUuid() << urlToSend << _attachmentData << _displayName << _jointIndices; + identityStream << getSessionUUID() << urlToSend << _attachmentData << _displayName << _jointIndices; #else - identityStream << QUuid() << urlToSend << _attachmentData << _displayName; + identityStream << getSessionUUID() << urlToSend << _attachmentData << _displayName; #endif return identityData; } - void AvatarData::setSkeletonModelURL(const QUrl& skeletonModelURL) { const QUrl& expanded = skeletonModelURL.isEmpty() ? AvatarData::defaultFullAvatarModelUrl() : skeletonModelURL; if (expanded == _skeletonModelURL) { return; } _skeletonModelURL = expanded; - qCDebug(avatars) << "Changing skeleton model for avatar to" << _skeletonModelURL.toString(); + qCDebug(avatars) << "Changing skeleton model for avatar" << getSessionUUID() << "to" << _skeletonModelURL.toString(); updateJointMappings(); }