summaryrefslogtreecommitdiff
path: root/indra/newview/llface.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-01-17 16:06:27 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-01-17 16:06:27 +0000
commite36745eb986ec9dd04c7f4f6d7a7249b7d5286a2 (patch)
treee2107a6f3afd57fcc817a5b8ea3566295105d0d4 /indra/newview/llface.cpp
parent500aaa16ff2aa35b318176fd01cfaba47376f5a5 (diff)
parent7acbd8ed8d73c507675d45360df07d232c431a8b (diff)
merge
Diffstat (limited to 'indra/newview/llface.cpp')
-rw-r--r--indra/newview/llface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index eebdb62aff..0a7e0c92be 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -2129,7 +2129,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
LLVector4a src;
U32 vec[4];
- vec[0] = vec[1] = vec[2] = vec[3] = color.mAll;
+ vec[0] = vec[1] = vec[2] = vec[3] = color.asRGBA();
src.loadua((F32*) vec);
@@ -2165,7 +2165,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
LLColor4U glow4u = LLColor4U(0,0,0,glow);
- U32 glow32 = glow4u.mAll;
+ U32 glow32 = glow4u.asRGBA();
U32 vec[4];
vec[0] = vec[1] = vec[2] = vec[3] = glow32;