diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-05 17:01:38 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-05 17:01:38 -0500 |
| commit | 05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (patch) | |
| tree | 70ae80b97c738ceee3b4ba530454e97a8698b6cb /indra/llimage | |
| parent | 68413474c4479eee9bdbeb34ea131475ba1d646e (diff) | |
| parent | 4ca084f7a06acc4ef861c1f4df2f857f8836b85e (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llimage')
| -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 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 |