From 4b52dd754b41948efca0087ccac6d813f1fcce3f Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 10 Jun 2024 18:16:13 +0200
Subject: Fix incorrect use of VX/VY/VZ/VW indices when color components are
 accessed

---
 indra/llcommon/lldefs.h | 154 ++++++++++++++++++++++++------------------------
 1 file changed, 77 insertions(+), 77 deletions(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/lldefs.h b/indra/llcommon/lldefs.h
index 0ba756d472..2fbb26dc1a 100644
--- a/indra/llcommon/lldefs.h
+++ b/indra/llcommon/lldefs.h
@@ -31,64 +31,64 @@
 #include <type_traits>
 
 // Often used array indices
-const U32   VX          = 0;
-const U32   VY          = 1;
-const U32   VZ          = 2;
-const U32   VW          = 3;
-const U32   VS          = 3;
-
-const U32   VRED        = 0;
-const U32   VGREEN      = 1;
-const U32   VBLUE       = 2;
-const U32   VALPHA      = 3;
-
-const U32   INVALID_DIRECTION = 0xFFFFFFFF;
-const U32   EAST        = 0;
-const U32   NORTH       = 1;
-const U32   WEST        = 2;
-const U32   SOUTH       = 3;
-
-const U32   NORTHEAST   = 4;
-const U32   NORTHWEST   = 5;
-const U32   SOUTHWEST   = 6;
-const U32   SOUTHEAST   = 7;
-const U32   MIDDLE      = 8;
-
-const U8    EAST_MASK       = 0x1<<EAST;
-const U8    NORTH_MASK      = 0x1<<NORTH;
-const U8    WEST_MASK       = 0x1<<WEST;
-const U8    SOUTH_MASK      = 0x1<<SOUTH;
-
-const U8    NORTHEAST_MASK  = NORTH_MASK | EAST_MASK;
-const U8    NORTHWEST_MASK  = NORTH_MASK | WEST_MASK;
-const U8    SOUTHWEST_MASK  = SOUTH_MASK | WEST_MASK;
-const U8    SOUTHEAST_MASK  = SOUTH_MASK | EAST_MASK;
-
-const U32 gDirOpposite[8] = {2, 3, 0, 1, 6, 7, 4, 5};
-const U32 gDirAdjacent[8][2] =  {
-                                {4, 7},
-                                {4, 5},
-                                {5, 6},
-                                {6, 7},
-                                {0, 1},
-                                {1, 2},
-                                {2, 3},
-                                {0, 3}
-                                };
+constexpr U32   VX          = 0;
+constexpr U32   VY          = 1;
+constexpr U32   VZ          = 2;
+constexpr U32   VW          = 3;
+constexpr U32   VS          = 3;
+
+constexpr U32   VRED        = 0;
+constexpr U32   VGREEN      = 1;
+constexpr U32   VBLUE       = 2;
+constexpr U32   VALPHA      = 3;
+
+constexpr U32   INVALID_DIRECTION = 0xFFFFFFFF;
+constexpr U32   EAST        = 0;
+constexpr U32   NORTH       = 1;
+constexpr U32   WEST        = 2;
+constexpr U32   SOUTH       = 3;
+
+constexpr U32   NORTHEAST   = 4;
+constexpr U32   NORTHWEST   = 5;
+constexpr U32   SOUTHWEST   = 6;
+constexpr U32   SOUTHEAST   = 7;
+constexpr U32   MIDDLE      = 8;
+
+constexpr U8    EAST_MASK       = 0x1<<EAST;
+constexpr U8    NORTH_MASK      = 0x1<<NORTH;
+constexpr U8    WEST_MASK       = 0x1<<WEST;
+constexpr U8    SOUTH_MASK      = 0x1<<SOUTH;
+
+constexpr U8    NORTHEAST_MASK  = NORTH_MASK | EAST_MASK;
+constexpr U8    NORTHWEST_MASK  = NORTH_MASK | WEST_MASK;
+constexpr U8    SOUTHWEST_MASK  = SOUTH_MASK | WEST_MASK;
+constexpr U8    SOUTHEAST_MASK  = SOUTH_MASK | EAST_MASK;
+
+constexpr U32 gDirOpposite[8] = {2, 3, 0, 1, 6, 7, 4, 5};
+constexpr U32 gDirAdjacent[8][2] =  {
+                                    {4, 7},
+                                    {4, 5},
+                                    {5, 6},
+                                    {6, 7},
+                                    {0, 1},
+                                    {1, 2},
+                                    {2, 3},
+                                    {0, 3}
+                                    };
 
 // Magnitude along the x and y axis
-const S32 gDirAxes[8][2] = {
-                            { 1, 0}, // east
-                            { 0, 1}, // north
-                            {-1, 0}, // west
-                            { 0,-1}, // south
-                            { 1, 1}, // ne
-                            {-1, 1}, // nw
-                            {-1,-1}, // sw
-                            { 1,-1}, // se
-                            };
-
-const S32 gDirMasks[8] = {
+constexpr S32 gDirAxes[8][2] = {
+                               { 1, 0}, // east
+                               { 0, 1}, // north
+                               {-1, 0}, // west
+                               { 0,-1}, // south
+                               { 1, 1}, // ne
+                               {-1, 1}, // nw
+                               {-1,-1}, // sw
+                               { 1,-1}, // se
+                               };
+
+constexpr S32 gDirMasks[8] = {
                             EAST_MASK,
                             NORTH_MASK,
                             WEST_MASK,
@@ -117,22 +117,22 @@ const S32 gDirMasks[8] = {
 //       | /       -6-      | /
 //       |/        /        |/
 //       +------------------+
-const U32 NO_SIDE       = 0;
-const U32 FRONT_SIDE    = 1;
-const U32 BACK_SIDE     = 2;
-const U32 LEFT_SIDE     = 3;
-const U32 RIGHT_SIDE    = 4;
-const U32 TOP_SIDE      = 5;
-const U32 BOTTOM_SIDE   = 6;
-
-const U8 LL_SOUND_FLAG_NONE =         0x0;
-const U8 LL_SOUND_FLAG_LOOP =         1<<0;
-const U8 LL_SOUND_FLAG_SYNC_MASTER =  1<<1;
-const U8 LL_SOUND_FLAG_SYNC_SLAVE =   1<<2;
-const U8 LL_SOUND_FLAG_SYNC_PENDING = 1<<3;
-const U8 LL_SOUND_FLAG_QUEUE =        1<<4;
-const U8 LL_SOUND_FLAG_STOP =         1<<5;
-const U8 LL_SOUND_FLAG_SYNC_MASK = LL_SOUND_FLAG_SYNC_MASTER | LL_SOUND_FLAG_SYNC_SLAVE | LL_SOUND_FLAG_SYNC_PENDING;
+constexpr U32 NO_SIDE       = 0;
+constexpr U32 FRONT_SIDE    = 1;
+constexpr U32 BACK_SIDE     = 2;
+constexpr U32 LEFT_SIDE     = 3;
+constexpr U32 RIGHT_SIDE    = 4;
+constexpr U32 TOP_SIDE      = 5;
+constexpr U32 BOTTOM_SIDE   = 6;
+
+constexpr U8 LL_SOUND_FLAG_NONE =         0x0;
+constexpr U8 LL_SOUND_FLAG_LOOP =         1<<0;
+constexpr U8 LL_SOUND_FLAG_SYNC_MASTER =  1<<1;
+constexpr U8 LL_SOUND_FLAG_SYNC_SLAVE =   1<<2;
+constexpr U8 LL_SOUND_FLAG_SYNC_PENDING = 1<<3;
+constexpr U8 LL_SOUND_FLAG_QUEUE =        1<<4;
+constexpr U8 LL_SOUND_FLAG_STOP =         1<<5;
+constexpr U8 LL_SOUND_FLAG_SYNC_MASK = LL_SOUND_FLAG_SYNC_MASTER | LL_SOUND_FLAG_SYNC_SLAVE | LL_SOUND_FLAG_SYNC_PENDING;
 
 //
 // *NOTE: These values may be used as hard-coded numbers in scanf() variants.
@@ -141,17 +141,17 @@ const U8 LL_SOUND_FLAG_SYNC_MASK = LL_SOUND_FLAG_SYNC_MASTER | LL_SOUND_FLAG_SYN
 // DO NOT CHANGE.
 // --------------
 //
-const U32   LL_MAX_PATH     = 1024;     // buffer size of maximum path + filename string length
+constexpr U32   LL_MAX_PATH     = 1024;     // buffer size of maximum path + filename string length
 
 // For strings we send in messages
-const U32   STD_STRING_BUF_SIZE = 255;  // Buffer size
-const U32   STD_STRING_STR_LEN  = 254;  // Length of the string (not including \0)
+constexpr U32   STD_STRING_BUF_SIZE = 255;  // Buffer size
+constexpr U32   STD_STRING_STR_LEN  = 254;  // Length of the string (not including \0)
 
 // *NOTE: This value is used as hard-coded numbers in scanf() variants.
 // DO NOT CHANGE.
-const U32   MAX_STRING          = STD_STRING_BUF_SIZE;  // Buffer size
+constexpr U32   MAX_STRING          = STD_STRING_BUF_SIZE;  // Buffer size
 
-const U32   MAXADDRSTR      = 17;       // 123.567.901.345 = 15 chars + \0 + 1 for good luck
+constexpr U32   MAXADDRSTR      = 17;       // 123.567.901.345 = 15 chars + \0 + 1 for good luck
 
 // C++ is our friend. . . use template functions to make life easier!
 
-- 
cgit v1.2.3