diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-11-16 10:56:05 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-11-16 10:56:05 -0500 |
commit | 934b94e74a94f13521b67bdd016a5b591e16fe13 (patch) | |
tree | d181a0811e1f6773f0a4bd44c72dae48fae45a4e /indra/newview/llface.cpp | |
parent | af349febb3275bc1d75026f1f022595b50abda24 (diff) | |
parent | 0c8556921d05a356afd4014b966ee8c0e1002e36 (diff) |
DRTVWR-418: pull in new viewer-release via viewer64
Diffstat (limited to 'indra/newview/llface.cpp')
-rw-r--r-- | indra/newview/llface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index de349a03d4..481c66aaf5 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -2132,7 +2132,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); @@ -2168,7 +2168,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; |