summaryrefslogtreecommitdiff
path: root/indra/llimage/llimage.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/llimage/llimage.cpp
parent500aaa16ff2aa35b318176fd01cfaba47376f5a5 (diff)
parent7acbd8ed8d73c507675d45360df07d232c431a8b (diff)
merge
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 04085eb703..cd7125197c 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -1227,9 +1227,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