diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-10-11 14:35:49 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-10-11 14:35:49 -0400 |
| commit | 0c7bc67814dd4fa347401c24ba0e1be78e4b838f (patch) | |
| tree | 450fc1ce0aff2f2880c32b3ca85161ca0ceff8a6 /indra/llimage/llimage.cpp | |
| parent | b6d22de58850fc9a5b34eeb5b7930e5845bfc42d (diff) | |
| parent | 25be14381e29481413c94edf5436c0af715a1578 (diff) | |
Automated merge with ssh://bitbucket.org/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 ad765b6415..bb345e282a 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 |