diff options
| author | davep <none@none> | 2014-08-27 13:04:32 -0500 |
|---|---|---|
| committer | davep <none@none> | 2014-08-27 13:04:32 -0500 |
| commit | 749d1665643b33d6c5b7b97e43f4eae996fbf465 (patch) | |
| tree | eea7beb291f9fbffd5284da4f55701dcf5286720 /indra/llmessage/lltransfermanager.cpp | |
| parent | d0428575fb9c3d285dc32e61808a877cb24efa89 (diff) | |
| parent | b021c90e7bccdd0f9a916946e7716a00034254c2 (diff) | |
Automated merge with https://bitbucket.org/davep/viewer-release
Diffstat (limited to 'indra/llmessage/lltransfermanager.cpp')
| -rwxr-xr-x | indra/llmessage/lltransfermanager.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llmessage/lltransfermanager.cpp b/indra/llmessage/lltransfermanager.cpp index d6db20d7a3..ec7b21d8b6 100755 --- a/indra/llmessage/lltransfermanager.cpp +++ b/indra/llmessage/lltransfermanager.cpp @@ -1260,9 +1260,13 @@ bool LLTransferTarget::addDelayedPacket( size); #ifdef _DEBUG - if (mDelayedPacketMap.find(packet_id) != mDelayedPacketMap.end()) + transfer_packet_map::iterator iter = mDelayedPacketMap.find(packet_id); + if (iter != mDelayedPacketMap.end()) { - LL_ERRS() << "Packet ALREADY in delayed packet map!" << LL_ENDL; + if (!(iter->second->mSize == size) && !(iter->second->mDatap == datap)) + { + LL_ERRS() << "Packet ALREADY in delayed packet map!" << LL_ENDL; + } } #endif |