diff options
author | simon <none@none> | 2015-02-20 09:22:11 -0800 |
---|---|---|
committer | simon <none@none> | 2015-02-20 09:22:11 -0800 |
commit | 10390bc470a32c91a8938d9dcb59a8ffa24786b1 (patch) | |
tree | c75b55f70ac61ed3f1670559c5912b9953d44aa8 | |
parent | c5f281913ec83652ee2a2304dd435690c74de591 (diff) |
Fix merge error
-rwxr-xr-x | indra/llmath/llmath.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h index 5f696381fa..a8b27ad189 100755 --- a/indra/llmath/llmath.h +++ b/indra/llmath/llmath.h @@ -556,7 +556,6 @@ inline void ll_remove_outliers(std::vector<VEC_TYPE>& data, F32 k) } } - llassert(NULL != src && NULL != dst); // Include simd math header #include "llsimdmath.h" |