From 0021c77789480a862e7ba13136f62d93005cf744 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 5 May 2014 16:29:11 -0700 Subject: [PATCH] Missed a spot for decoding avatar identity data. --- libraries/avatars/src/AvatarHashMap.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp index 6b17a3fab8..8e3797cbc0 100644 --- a/libraries/avatars/src/AvatarHashMap.cpp +++ b/libraries/avatars/src/AvatarHashMap.cpp @@ -127,8 +127,9 @@ void AvatarHashMap::processAvatarIdentityPacket(const QByteArray &packet, const while (!identityStream.atEnd()) { QUrl faceMeshURL, skeletonURL; + QVector attachmentData; QString displayName; - identityStream >> sessionUUID >> faceMeshURL >> skeletonURL >> displayName; + identityStream >> sessionUUID >> faceMeshURL >> skeletonURL >> attachmentData >> displayName; // mesh URL for a UUID, find avatar in our list AvatarSharedPointer matchingAvatar = matchingOrNewAvatar(sessionUUID, mixerWeakPointer); @@ -142,6 +143,10 @@ void AvatarHashMap::processAvatarIdentityPacket(const QByteArray &packet, const matchingAvatar->setSkeletonModelURL(skeletonURL); } + if (matchingAvatar->getAttachmentData() != attachmentData) { + matchingAvatar->setAttachmentData(attachmentData); + } + if (matchingAvatar->getDisplayName() != displayName) { matchingAvatar->setDisplayName(displayName); } @@ -171,4 +176,4 @@ void AvatarHashMap::processKillAvatar(const QByteArray& datagram) { if (matchedAvatar != _avatarHash.end()) { erase(matchedAvatar); } -} \ No newline at end of file +}