1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llmath/llmatrix4a.h b/indra/llmath/llmatrix4a.h
index 3b423f783a..2967949993 100644
--- a/indra/llmath/llmatrix4a.h
+++ b/indra/llmath/llmatrix4a.h
@@ -31,15 +31,13 @@
 #include "m4math.h"
 #include "m3math.h"
 
-class LLMatrix4a
+class alignas(16) LLMatrix4a
 {
+    LL_ALIGN_NEW
 public:
-    LL_ALIGN_16(LLVector4a mMatrix[4]);
+    LLVector4a mMatrix[4];
 
-    LLMatrix4a()
-    {
-
-    }
+    LLMatrix4a() = default;
 
     explicit LLMatrix4a(const LLMatrix4& val)
     {
@@ -228,6 +226,8 @@ public:
     const LLVector4a& getTranslation() const { return mMatrix[3]; }
 };
 
+static_assert(std::is_trivial<LLMatrix4a>::value, "LLMatrix4a must be a trivial type");
+
 inline LLVector4a rowMul(const LLVector4a &row, const LLMatrix4a &mat)
 {
     LLVector4a result;