diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-02-03 09:54:52 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-02-03 09:54:52 -0500 |
| commit | 434f0e161aa7b378ff16d526e104e580ba367ab2 (patch) | |
| tree | a7eed0bd6d7278fa63c362fb7ddb4789d7408705 /indra/newview/llvosky.h | |
| parent | 080744d8990e6b18a80858803a20a5ec87020d82 (diff) | |
| parent | f40bd0fac308b21319d84ee221cb8f81d369dd71 (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; } |