diff options
| author | simon <none@none> | 2014-08-21 09:11:11 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-08-21 09:11:11 -0700 |
| commit | 95a14433b8b6375b8d62970c6df5a08d98764423 (patch) | |
| tree | 8578902253fc5454827e24eedc39717be9d987e2 /indra/llmessage | |
| parent | a14ba78dbbfc925c94f1e8ed94b52bc08e626e3d (diff) | |
| parent | 518cc86156c2e10b9e603ac9e661f8c35faf5f70 (diff) | |
Merge downstream code into viewer-lion and become version 3.7.15
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 |