From 2121ffcdabf97745f1fc4db6d5183b1d8cb57ce9 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Fri, 11 Jul 2014 16:46:18 -0700 Subject: Fixed assert in llmemory.h for adjacent memory locations. --- indra/llcommon/llmemory.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index db52f2b1f4..7d1d541a4b 100755 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -257,7 +257,8 @@ inline void ll_memcpy_nonaliased_aligned_16(char* __restrict dst, const char* __ assert((bytes % sizeof(F32))== 0); ll_assert_aligned(src,16); ll_assert_aligned(dst,16); - assert((src < dst) ? ((src + bytes) < dst) : ((dst + bytes) < src)); + + assert((src < dst) ? ((src + bytes) <= dst) : ((dst + bytes) <= src)); assert(bytes%16==0); char* end = dst + bytes; -- cgit v1.2.3 From 3d4acb535d75c4cc78c93dee318bcffaca691237 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Tue, 22 Jul 2014 17:24:00 -0700 Subject: Appears to fix MAINT-4184 --- indra/llmessage/lltransfermanager.cpp | 8 ++++++-- indra/newview/lltexturefetch.cpp | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'indra') 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 diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 9ea46cab68..fcf0d88495 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -2648,7 +2648,8 @@ bool LLTextureFetch::createRequest(FTType f_type, const std::string& url, const worker->setImagePriority(priority); worker->setDesiredDiscard(desired_discard, desired_size); worker->setCanUseHTTP(can_use_http); - worker->setUrl(url); + + //worker->setUrl(url); //MAINT-4184 this line seems to be the cause and url is always blank. if (!worker->haveWork()) { worker->setState(LLTextureFetchWorker::INIT); -- cgit v1.2.3 From 342833534f44cf702b9680c24e520904da8c8ecf Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Wed, 23 Jul 2014 09:16:48 -0700 Subject: Improved comments --- indra/newview/lltexturefetch.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index fcf0d88495..2376f6a259 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -2649,7 +2649,8 @@ bool LLTextureFetch::createRequest(FTType f_type, const std::string& url, const worker->setDesiredDiscard(desired_discard, desired_size); worker->setCanUseHTTP(can_use_http); - //worker->setUrl(url); //MAINT-4184 this line seems to be the cause and url is always blank. + //MAINT-4184 url is always empty. Do not set with it. + if (!worker->haveWork()) { worker->setState(LLTextureFetchWorker::INIT); -- cgit v1.2.3