livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-7626 Incorporate transfer changes into viewer

master
andreykproductengine 2018-05-04 10:35:50 +03:00
parent 7b5c0dd39a
commit 14ed34f26d
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llmessage/llxfermanager.cpp
View File

@ -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;