diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-08-01 14:26:33 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-08-01 14:26:33 -0700 |
| commit | fb7c5efe3217e10a8258c9ed276116f64925e0e0 (patch) | |
| tree | aa6109670d22842107a19281d655f9a63613b1b8 /indra/llmessage | |
| parent | 83d5f20b1cbd29a86090f40b1dcc9236f15ca249 (diff) | |
| parent | 342833534f44cf702b9680c24e520904da8c8ecf (diff) | |
Pulled in fix for maint-4184 blurry textures
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 |