diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-05-04 10:35:50 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-05-04 10:35:50 +0300 |
| commit | 14ed34f26dbc2c62fc13984cedf20d8e48c34417 (patch) | |
| tree | b3deb9c0f0da669cd5af4e0a402b7b4ba13390ad /indra/llmessage | |
| parent | 7b5c0dd39a0928601a0e0ae51d4a75ac7f254ab3 (diff) | |
MAINT-7626 Incorporate transfer changes into viewer
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llxfermanager.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp index 8f18004791..70def36d51 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; |