diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-08-04 21:35:57 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-08-04 21:35:57 +0000 |
| commit | 8fe0084108202f307291d5d9be586e5186c2b1de (patch) | |
| tree | ade28d7acd7eaf455657260db2b1dc5768e475e4 /indra/llmessage | |
| parent | 9fb96b416f0612882ddcaa658945a5b3f73ff331 (diff) | |
| parent | 9a8b1552f0fbff3cde1c8fa5e24924e237008814 (diff) | |
Merge. Refresh from viewer-library-refresh after 3.7.13 release.
Diffstat (limited to 'indra/llmessage')
| -rwxr-xr-x | indra/llmessage/llares.h | 2 | ||||
| -rwxr-xr-x | indra/llmessage/llhttpassetstorage.cpp | 2 | ||||
| -rwxr-xr-x | indra/llmessage/lltransfermanager.cpp | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/indra/llmessage/llares.h b/indra/llmessage/llares.h index 0b5d49e322..c727363b60 100755 --- a/indra/llmessage/llares.h +++ b/indra/llmessage/llares.h @@ -39,7 +39,7 @@ # pragma warning(pop) #endif -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include <ares.h> #else # include <ares/ares.h> diff --git a/indra/llmessage/llhttpassetstorage.cpp b/indra/llmessage/llhttpassetstorage.cpp index f168ac4ec6..a30140e8f3 100755 --- a/indra/llmessage/llhttpassetstorage.cpp +++ b/indra/llmessage/llhttpassetstorage.cpp @@ -38,7 +38,7 @@ #include "llvfs.h" #include "llxfer.h" -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include <zlib.h> #else # include "zlib/zlib.h" 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 |