diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index ad65ba4410..1427ce6359 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -1474,12 +1474,12 @@ void AvatarData::parseAvatarIdentityPacket(const QByteArray& data, Identity& ide QDataStream packetStream(data); packetStream >> identityOut.uuid - >> identityOut.skeletonModelURL - >> identityOut.attachmentData - >> identityOut.displayName - >> identityOut.sessionDisplayName - >> identityOut.avatarEntityData - >> identityOut.updatedAt; + >> identityOut.skeletonModelURL + >> identityOut.attachmentData + >> identityOut.displayName + >> identityOut.sessionDisplayName + >> identityOut.avatarEntityData + >> identityOut.updatedAt; #ifdef WANT_DEBUG qCDebug(avatars) << __FUNCTION__ @@ -1547,12 +1547,12 @@ QByteArray AvatarData::identityByteArray() const { _avatarEntitiesLock.withReadLock([&] { identityStream << getSessionUUID() - << urlToSend - << _attachmentData - << _displayName - << getSessionDisplayNameForTransport() // depends on _sessionDisplayName - << _avatarEntityData - << _identityUpdatedAt; + << urlToSend + << _attachmentData + << _displayName + << getSessionDisplayNameForTransport() // depends on _sessionDisplayName + << _avatarEntityData + << _identityUpdatedAt; }); return identityData; diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp index f9694f1cd9..8d4edab2d5 100644 --- a/libraries/networking/src/ResourceCache.cpp +++ b/libraries/networking/src/ResourceCache.cpp @@ -747,7 +747,7 @@ bool Resource::handleFailedRequest(ResourceRequest::Result result) { _attempts++; _attemptsRemaining--; - qCDebug(networking) << "Retriable error while loading" << _url << "attempt:" << _attempts << "attemptsRemaining:" << _attemptsRemaining; + qCDebug(networking) << "Retryable error while loading" << _url << "attempt:" << _attempts << "attemptsRemaining:" << _attemptsRemaining; // retry with increasing delays const int BASE_DELAY_MS = 1000; @@ -765,7 +765,7 @@ bool Resource::handleFailedRequest(ResourceRequest::Result result) { _attemptsRemaining = 0; qCDebug(networking) << "Error loading " << _url << "attempt:" << _attempts << "attemptsRemaining:" << _attemptsRemaining; auto error = (result == ResourceRequest::Timeout) ? QNetworkReply::TimeoutError - : QNetworkReply::UnknownNetworkError; + : QNetworkReply::UnknownNetworkError; emit failed(error); willRetry = false; finishedLoading(false);