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/newview/llspatialpartition.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llspatialpartition.cpp')

diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index f3cfbd9565..4ba47aa4da 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -3625,12 +3625,11 @@ bool LLSpatialPartition::isVisible(const LLVector3& v)
     return true;
 }
 
-LL_ALIGN_PREFIX(16)
-class LLOctreeIntersect : public LLOctreeTraveler<LLViewerOctreeEntry, LLPointer<LLViewerOctreeEntry>>
+class alignas(16) LLOctreeIntersect : public LLOctreeTraveler<LLViewerOctreeEntry, LLPointer<LLViewerOctreeEntry>>
 {
 public:
-    LL_ALIGN_16(LLVector4a mStart);
-    LL_ALIGN_16(LLVector4a mEnd);
+    LLVector4a mStart;
+    LLVector4a mEnd;
 
     S32       *mFaceHit;
     LLVector4a *mIntersection;
@@ -3780,7 +3779,7 @@ public:
 
         return false;
     }
-} LL_ALIGN_POSTFIX(16);
+};
 
 LLDrawable* LLSpatialPartition::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end,
                                                      bool pick_transparent,
-- 
cgit v1.3