diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-03-13 16:38:00 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-03-13 16:38:00 -0400 |
commit | 66de0c9965ff68bcb8cb60975fcffa45e2c6d74c (patch) | |
tree | e3fa6c87fe70e487b6fc6e94f6793b7638b568ea /indra/newview/llvosky.h | |
parent | 49e114748fdb52599aaa141c2006198c48aa083b (diff) | |
parent | 17c8eadb3d89bc78019f0b50eb8b109f25616781 (diff) |
Automated merge with ssh://bitbucket.org/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; } |