summaryrefslogtreecommitdiff
path: root/indra/llimage/llimage.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-11-16 10:56:05 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-11-16 10:56:05 -0500
commit934b94e74a94f13521b67bdd016a5b591e16fe13 (patch)
treed181a0811e1f6773f0a4bd44c72dae48fae45a4e /indra/llimage/llimage.cpp
parentaf349febb3275bc1d75026f1f022595b50abda24 (diff)
parent0c8556921d05a356afd4014b966ee8c0e1002e36 (diff)
DRTVWR-418: pull in new viewer-release via viewer64
Diffstat (limited to 'indra/llimage/llimage.cpp')
-rw-r--r--indra/llimage/llimage.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index f71607096c..a6cbcc131e 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -1218,9 +1218,10 @@ void LLImageRaw::fill( const LLColor4U& color )
if( 4 == getComponents() )
{
U32* data = (U32*) getData();
+ U32 rgbaColor = color.asRGBA();
for( S32 i = 0; i < pixels; i++ )
{
- data[i] = color.mAll;
+ data[ i ] = rgbaColor;
}
}
else