From 14ed34f26dbc2c62fc13984cedf20d8e48c34417 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 4 May 2018 10:35:50 +0300
Subject: [PATCH] MAINT-7626 Incorporate transfer changes into viewer
---
indra/llmessage/llxfermanager.cpp | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp
index 8f18004791b..70def36d51d 100644
--- a/indra/llmessage/llxfermanager.cpp
+++ b/indra/llmessage/llxfermanager.cpp
@@ -1099,7 +1099,6 @@ void LLXferManager::retransmitUnackedPackets()
{
LL_INFOS() << "resending xfer " << xferp->mRemoteHost << ":" << xferp->getFileName() << " packet unconfirmed after: "<< et << " sec, packet " << xferp->mPacketNum << LL_ENDL;
xferp->resendLastPacket();
- xferp = xferp->mNext;
}
}
else if ((xferp->mStatus == e_LL_XFER_REGISTERED) && ( (et = xferp->ACKTimer.getElapsedTimeF32()) > LL_XFER_REGISTRATION_TIMEOUT))
@@ -1137,14 +1136,10 @@ void LLXferManager::retransmitUnackedPackets()
xferp->sendNextPacket();
changeNumActiveXfers(xferp->mRemoteHost,1);
}
- }
- xferp = xferp->mNext;
- }
- else
- {
- xferp = xferp->mNext;
+ }
}
- }
+ ++iter;
+ } // end while() loop
//
// HACK - if we're using xfer confirm throttling, throttle our xfer confirms here
@@ -1240,7 +1235,6 @@ void LLXferManager::startPendingDownloads()
{
++download_count;
}
- xferp = xferp->mNext;
}
S32 start_count = mMaxIncomingXfers - download_count;
--
GitLab