Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 17:17:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Missed a spot for decoding avatar identity data.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-05-05 16:29:11 -07:00
parent fd0a39df12
commit 0021c77789
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/avatars/src/AvatarHashMap.cpp
View file

@ -127,8 +127,9 @@ void AvatarHashMap::processAvatarIdentityPacket(const QByteArray &packet, const
while (!identityStream.atEnd()) { while (!identityStream.atEnd()) {
QUrl faceMeshURL, skeletonURL; QUrl faceMeshURL, skeletonURL;
QVector<AttachmentData> attachmentData;
QString displayName; QString displayName;
identityStream >> sessionUUID >> faceMeshURL >> skeletonURL >> displayName; identityStream >> sessionUUID >> faceMeshURL >> skeletonURL >> attachmentData >> displayName;
// mesh URL for a UUID, find avatar in our list // mesh URL for a UUID, find avatar in our list
AvatarSharedPointer matchingAvatar = matchingOrNewAvatar(sessionUUID, mixerWeakPointer); AvatarSharedPointer matchingAvatar = matchingOrNewAvatar(sessionUUID, mixerWeakPointer);
@ -142,6 +143,10 @@ void AvatarHashMap::processAvatarIdentityPacket(const QByteArray &packet, const
matchingAvatar->setSkeletonModelURL(skeletonURL); matchingAvatar->setSkeletonModelURL(skeletonURL);
} }
if (matchingAvatar->getAttachmentData() != attachmentData) {
matchingAvatar->setAttachmentData(attachmentData);
}
if (matchingAvatar->getDisplayName() != displayName) { if (matchingAvatar->getDisplayName() != displayName) {
matchingAvatar->setDisplayName(displayName); matchingAvatar->setDisplayName(displayName);
} }
@ -171,4 +176,4 @@ void AvatarHashMap::processKillAvatar(const QByteArray& datagram) {
if (matchedAvatar != _avatarHash.end()) { if (matchedAvatar != _avatarHash.end()) {
erase(matchedAvatar); erase(matchedAvatar);
} }
} }