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/newview/llvosky.h | |
| parent | 6ac2b2bb4f569b6663607894034b4ec64804e905 (diff) | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llvosky.h')
| -rw-r--r-- | indra/newview/llvosky.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h index ee8e91fb71..9cfb9773bd 100644 --- a/indra/newview/llvosky.h +++ b/indra/newview/llvosky.h @@ -171,7 +171,7 @@ protected: { S32 offset = (i * sResolution + j) * sComponents; U32* pix = (U32*) &(mImageRaw[sCurrent]->getData()[offset]); - *pix = col.mAll; + *pix = col.asRGBA(); } LLColor4U getPixel(const S32 i, const S32 j) @@ -179,7 +179,7 @@ protected: LLColor4U col; S32 offset = (i * sResolution + j) * sComponents; U32* pix = (U32*) &(mImageRaw[sCurrent]->getData()[offset]); - col.mAll = *pix; + col.fromRGBA( *pix ); return col; } |