summaryrefslogtreecommitdiff
path: root/indra/llmath/llsimdmath.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-07-31 14:55:15 -0400
committerOz Linden <oz@lindenlab.com>2012-07-31 14:55:15 -0400
commitdf93749819c503a66bc0ad34aeb1c7bed3746df2 (patch)
tree9bc6ae94c08fd881b8a73bfc0bc4ea79169ebf9e /indra/llmath/llsimdmath.h
parent764d1e3cafa3e86f1f44a4c2bec0705879b9da38 (diff)
parentb8bac66a0f8c392a221ad2c64611e2a55de82339 (diff)
merge up to latest viewer-development
Diffstat (limited to 'indra/llmath/llsimdmath.h')
-rw-r--r--indra/llmath/llsimdmath.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h
index c7cdf7b32c..01458521ec 100644
--- a/indra/llmath/llsimdmath.h
+++ b/indra/llmath/llsimdmath.h
@@ -67,11 +67,10 @@ template <typename T> T* LL_NEXT_ALIGNED_ADDRESS_64(T* address)
#define LL_ALIGN_16(var) LL_ALIGN_PREFIX(16) var LL_ALIGN_POSTFIX(16)
-
-
#include <xmmintrin.h>
#include <emmintrin.h>
+#include "llmemory.h"
#include "llsimdtypes.h"
#include "llsimdtypes.inl"