From a9972bbf025cc2bce63b976c396dfc7063082c74 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 30 Oct 2013 20:32:22 +0100 Subject: [PATCH 1/2] Suppress spammy warning (debug mode) --- indra/llmessage/llhttpclient.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp index dfbc9e249..749c5df6f 100644 --- a/indra/llmessage/llhttpclient.cpp +++ b/indra/llmessage/llhttpclient.cpp @@ -343,6 +343,7 @@ void LLHTTPClient::ResponderBase::decode_llsd_body(U32 status, std::string const strncmp(str, "cap not found:", 14) && // Most of the other 3%. str[0] && // Empty happens too and aint LLSD either. strncmp(str, "Not Found", 9) && + strncmp(str, "Upstream error: ", 16) && // Received by LLEventPollResponder every 50 seconds (see http://wiki.secondlife.com/wiki/EventQueueGet). LLSDSerialize::fromXML(dummy, ss) > 0; if (server_sent_llsd_with_http_error) { From e4b35a050dc1ccb23921d224f7d5ce4c5825b83b Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Thu, 31 Oct 2013 02:38:23 +0100 Subject: [PATCH 2/2] This makes more sense --- indra/llcommon/llmemory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index 084f9780c..50739b677 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -200,7 +200,7 @@ 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;