From 6cf4ff1dafe54a9a3c5fae656cdf5c23d51a915f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 15 Jun 2017 13:44:44 -0700 Subject: [PATCH] remove debug and fix peek of session ID --- assignment-client/src/avatars/AvatarMixerSlave.cpp | 1 - libraries/avatars/src/AvatarHashMap.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixerSlave.cpp b/assignment-client/src/avatars/AvatarMixerSlave.cpp index 17d222e9e3..4d5e507923 100644 --- a/assignment-client/src/avatars/AvatarMixerSlave.cpp +++ b/assignment-client/src/avatars/AvatarMixerSlave.cpp @@ -479,7 +479,6 @@ void AvatarMixerSlave::broadcastAvatarDataToDownstreamMixer(const SharedNodePoin auto lastBroadcastTime = nodeData->getLastBroadcastTime(agentNode->getUUID()); if (lastBroadcastTime <= agentNodeData->getIdentityChangeTimestamp() || (start - lastBroadcastTime) >= REBROADCAST_IDENTITY_TO_DOWNSTREAM_EVERY_US) { - qDebug() << "Sending identity packet for " << agentNode->getUUID() << " to " << node->getUUID(); sendReplicatedIdentityPacket(agentNodeData, node); nodeData->setLastBroadcastTime(agentNode->getUUID(), start); } diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp index cfbf2a8806..023bb39201 100644 --- a/libraries/avatars/src/AvatarHashMap.cpp +++ b/libraries/avatars/src/AvatarHashMap.cpp @@ -128,7 +128,7 @@ AvatarSharedPointer AvatarHashMap::parseAvatarData(QSharedPointer message, SharedNodePointer sendingNode) { // peek the avatar UUID from the incoming packet - QUuid identityUUID = message->peek(NUM_BYTES_RFC4122_UUID); + QUuid identityUUID = QUuid::fromRfc4122(message->peek(NUM_BYTES_RFC4122_UUID)); // make sure this isn't for an ignored avatar auto nodeList = DependencyManager::get();