diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 03:20:12 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 03:20:12 +0200 |
commit | 57a99273ed023bd71c54399969e66ffc23eebc57 (patch) | |
tree | d8569d41eaf78348e458f550f382375cac47924d /indra/llimage/llimage.cpp | |
parent | 6ac2b2bb4f569b6663607894034b4ec64804e905 (diff) | |
parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llimage/llimage.cpp')
-rw-r--r-- | indra/llimage/llimage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 0fa0ef79d9..4a76d15096 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -1232,9 +1232,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 |