Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 03:55:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10297 from ZappoMan/retrySkeletonURL

Browse source 
format and spelling changes
This commit is contained in:
Chris Collins 2017-04-26 21:58:51 -07:00 committed by GitHub
commit 6ecbaff56e
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libraries/avatars/src/AvatarData.cpp
View file

@ -1474,12 +1474,12 @@ void AvatarData::parseAvatarIdentityPacket(const QByteArray& data, Identity& ide
QDataStream packetStream(data); QDataStream packetStream(data);
packetStream >> identityOut.uuid packetStream >> identityOut.uuid
>> identityOut.skeletonModelURL >> identityOut.skeletonModelURL
>> identityOut.attachmentData >> identityOut.attachmentData
>> identityOut.displayName >> identityOut.displayName
>> identityOut.sessionDisplayName >> identityOut.sessionDisplayName
>> identityOut.avatarEntityData >> identityOut.avatarEntityData
>> identityOut.updatedAt; >> identityOut.updatedAt;
#ifdef WANT_DEBUG #ifdef WANT_DEBUG
qCDebug(avatars) << __FUNCTION__ qCDebug(avatars) << __FUNCTION__
@ -1547,12 +1547,12 @@ QByteArray AvatarData::identityByteArray() const {
_avatarEntitiesLock.withReadLock([&] { _avatarEntitiesLock.withReadLock([&] {
identityStream << getSessionUUID() identityStream << getSessionUUID()
<< urlToSend << urlToSend
<< _attachmentData << _attachmentData
<< _displayName << _displayName
<< getSessionDisplayNameForTransport() // depends on _sessionDisplayName << getSessionDisplayNameForTransport() // depends on _sessionDisplayName
<< _avatarEntityData << _avatarEntityData
<< _identityUpdatedAt; << _identityUpdatedAt;
}); });
return identityData; return identityData;

4
libraries/networking/src/ResourceCache.cpp
View file

@ -747,7 +747,7 @@ bool Resource::handleFailedRequest(ResourceRequest::Result result) {
_attempts++; _attempts++;
_attemptsRemaining--; _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 // retry with increasing delays
const int BASE_DELAY_MS = 1000; const int BASE_DELAY_MS = 1000;
@ -765,7 +765,7 @@ bool Resource::handleFailedRequest(ResourceRequest::Result result) {
_attemptsRemaining = 0; _attemptsRemaining = 0;
qCDebug(networking) << "Error loading " << _url << "attempt:" << _attempts << "attemptsRemaining:" << _attemptsRemaining; qCDebug(networking) << "Error loading " << _url << "attempt:" << _attempts << "attemptsRemaining:" << _attemptsRemaining;
auto error = (result == ResourceRequest::Timeout) ? QNetworkReply::TimeoutError auto error = (result == ResourceRequest::Timeout) ? QNetworkReply::TimeoutError
: QNetworkReply::UnknownNetworkError; : QNetworkReply::UnknownNetworkError;
emit failed(error); emit failed(error);
willRetry = false; willRetry = false;
finishedLoading(false); finishedLoading(false);