summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-07-11 16:46:18 -0700
committerAura Linden <aura@lindenlab.com>2014-07-11 16:46:18 -0700
commit2121ffcdabf97745f1fc4db6d5183b1d8cb57ce9 (patch)
tree77eb953f887cf8390c3181e181c42f441bb35d38
parent226929f8f5b8bc1080d0082b2595d689238df2b8 (diff)
Fixed assert in llmemory.h for adjacent memory locations.
-rwxr-xr-xindra/llcommon/llmemory.h3
1 files changed, 2 insertions, 1 deletions
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;