diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-18 14:38:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-18 14:38:46 -0400 |
| commit | d3c63401d26406093023e7cf4426ef4e29e138fd (patch) | |
| tree | 3e3274e9782adbede8c0ebbd04bc2292746c526e /indra/llmessage | |
| parent | 5519e8eac2c173949ed6cd67eb5ca6344dbace33 (diff) | |
| parent | b021c90e7bccdd0f9a916946e7716a00034254c2 (diff) | |
merge changes for 3.7.14-release
Diffstat (limited to 'indra/llmessage')
| -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 |