Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed

3 files changed, 14 insertions, 14 deletions

diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index 743c1745d0..de18fce0f8 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -1422,9 +1422,9 @@ void LLAvatarAppearance::setClothesColor( ETextureIndex te, const LLColor4& new_
     U32 param_name[3];
     if( teToColorParams( te, param_name ) )
     {
-        setVisualParamWeight( param_name[0], new_color.mV[VX]);
-        setVisualParamWeight( param_name[1], new_color.mV[VY]);
-        setVisualParamWeight( param_name[2], new_color.mV[VZ]);
+        setVisualParamWeight( param_name[0], new_color.mV[VRED]);
+        setVisualParamWeight( param_name[1], new_color.mV[VGREEN]);
+        setVisualParamWeight( param_name[2], new_color.mV[VBLUE]);
     }
 }
 
@@ -1434,9 +1434,9 @@ LLColor4 LLAvatarAppearance::getClothesColor( ETextureIndex te )
     U32 param_name[3];
     if( teToColorParams( te, param_name ) )
     {
-        color.mV[VX] = getVisualParamWeight( param_name[0] );
-        color.mV[VY] = getVisualParamWeight( param_name[1] );
-        color.mV[VZ] = getVisualParamWeight( param_name[2] );
+        color.mV[VRED] = getVisualParamWeight( param_name[0] );
+        color.mV[VGREEN] = getVisualParamWeight( param_name[1] );
+        color.mV[VBLUE] = getVisualParamWeight( param_name[2] );
     }
     return color;
 }
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 60ff19f952..d376c68c7f 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -1038,7 +1038,7 @@ bool LLTexLayer::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bou
     bool success = true;
 
     // If you can't see the layer, don't render it.
-    if( is_approx_zero( net_color.mV[VW] ) )
+    if( is_approx_zero( net_color.mV[VALPHA] ) )
     {
         return success;
     }
@@ -1213,7 +1213,7 @@ bool LLTexLayer::findNetColor(LLColor4* net_color) const
         {
             net_color->setVec( mTexLayerSet->getAvatarAppearance()->getGlobalColor( getInfo()->mGlobalColor ) );
         }
-        else if (getInfo()->mFixedColor.mV[VW])
+        else if (getInfo()->mFixedColor.mV[VALPHA])
         {
             net_color->setVec( getInfo()->mFixedColor );
         }
@@ -1232,7 +1232,7 @@ bool LLTexLayer::findNetColor(LLColor4* net_color) const
         return true;
     }
 
-    if( getInfo()->mFixedColor.mV[VW] )
+    if( getInfo()->mFixedColor.mV[VALPHA] )
     {
         net_color->setVec( getInfo()->mFixedColor );
         return true;
@@ -1373,7 +1373,7 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC
 
     // Draw a rectangle with the layer color to multiply the alpha by that color's alpha.
     // Note: we're still using gGL.blendFunc( GL_DST_ALPHA, GL_ZERO );
-    if ( !is_approx_equal(layer_color.mV[VW], 1.f) )
+    if ( !is_approx_equal(layer_color.mV[VALPHA], 1.f) )
     {
         gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         gGL.color4fv(layer_color.mV);
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp
index 7beffbcd19..30551c115d 100644
--- a/indra/llappearance/lltexlayerparams.cpp
+++ b/indra/llappearance/lltexlayerparams.cpp
@@ -464,10 +464,10 @@ LLColor4 LLTexLayerParamColor::getNetColor() const
         F32 weight = scaled_weight - index_start;
         const LLColor4 *start = &info->mColors[ index_start ];
         const LLColor4 *end   = &info->mColors[ index_end ];
-        return LLColor4((1.f - weight) * start->mV[VX] + weight * end->mV[VX],
-                        (1.f - weight) * start->mV[VY] + weight * end->mV[VY],
-                        (1.f - weight) * start->mV[VZ] + weight * end->mV[VZ],
-                        (1.f - weight) * start->mV[VW] + weight * end->mV[VW]);
+        return LLColor4((1.f - weight) * start->mV[VRED] + weight * end->mV[VRED],
+                        (1.f - weight) * start->mV[VGREEN] + weight * end->mV[VGREEN],
+                        (1.f - weight) * start->mV[VBLUE] + weight * end->mV[VBLUE],
+                        (1.f - weight) * start->mV[VALPHA] + weight * end->mV[VALPHA]);
     }
 }