diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 1fe71cf59e..b394673702 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -363,7 +363,7 @@ void AvatarMixer::broadcastAvatarData() { numAvatarDataBytes += avatarPacketList->write(otherNode->getUUID().toRfc4122()); numAvatarDataBytes += - avatarPacketList->write(otherAvatar.toByteArray(false, distribution(generator) < AVATAR_SEND_FULL_UPDATE_RATIO), sendMinimumForOutOfView); + avatarPacketList->write(otherAvatar.toByteArray(false, distribution(generator) < AVATAR_SEND_FULL_UPDATE_RATIO, sendMinimumForOutOfView)); avatarPacketList->endSegment(); }); diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 00db9ae943..3f61c5f8aa 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -217,8 +217,7 @@ QByteArray AvatarData::toByteArray(bool cullSmallChanges, bool sendAll, bool sen memcpy(destinationBuffer, &_globalPosition, sizeof(_globalPosition)); destinationBuffer += sizeof(_globalPosition); qDebug() << __FUNCTION__ << "minimum... included global position!!"; - } - else { + } else { //qDebug() << __FUNCTION__ << "not minimum... sending actual content!!"; auto header = reinterpret_cast(destinationBuffer); @@ -541,10 +540,10 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) { memcpy(&_globalPosition, sourceBuffer, sizeof(_globalPosition)); sourceBuffer += sizeof(_globalPosition); - int numBytesRead = (sourceBuffer - startPosition) + sizeof(packetStateFlags); + int numBytesRead = (sourceBuffer - startPosition); _averageBytesReceived.updateAverage(numBytesRead); - qDebug() << __FUNCTION__ << "minimum... included global position!! numBytesRead:" << numBytesRead; + //qDebug() << __FUNCTION__ << "minimum... included global position!! numBytesRead:" << numBytesRead; return numBytesRead; }