From 10390bc470a32c91a8938d9dcb59a8ffa24786b1 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Fri, 20 Feb 2015 09:22:11 -0800
Subject: Fix merge error

---
 indra/llmath/llmath.h | 1 -
 1 file changed, 1 deletion(-)

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"
 
-- 
cgit v1.2.3