From e803bbc0db695abe73de9797510ba22646528e23 Mon Sep 17 00:00:00 2001
From: Rye <rye@alchemyviewer.org>
Date: Mon, 27 Oct 2025 02:55:56 -0400
Subject: Modernize viewer alignment macros to use alignas and fix misaligned
 class issues reported by ubsan/asan

Signed-off-by: Rye <rye@alchemyviewer.org>
---
 indra/llmath/llmatrix3a.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/llmath/llmatrix3a.h')

diff --git a/indra/llmath/llmatrix3a.h b/indra/llmath/llmatrix3a.h
index 9b173c22ed..742a2488fd 100644
--- a/indra/llmath/llmatrix3a.h
+++ b/indra/llmath/llmatrix3a.h
@@ -40,8 +40,9 @@
 
 // LLMatrix3a is the base class for LLRotation, which should be used instead any time you're dealing with a
 // rotation matrix.
-class LLMatrix3a
+class alignas(16) LLMatrix3a
 {
+    LL_ALIGN_NEW
 public:
 
     // Utility function for quickly transforming an array of LLVector4a's
@@ -111,7 +112,7 @@ public:
 
 protected:
 
-    LL_ALIGN_16(LLVector4a mColumns[3]);
+    LLVector4a mColumns[3];
 
 };
 
-- 
cgit v1.3