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.cpp | |
parent | 080744d8990e6b18a80858803a20a5ec87020d82 (diff) | |
parent | f40bd0fac308b21319d84ee221cb8f81d369dd71 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llvosky.cpp')
-rw-r--r-- | indra/newview/llvosky.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 4dab213fa0..6b4a450e6f 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -283,7 +283,7 @@ void LLSkyTex::create(const F32 brightness) S32 offset = basic_offset * sComponents; U32* pix = (U32*)(data + offset); LLColor4U temp = LLColor4U(mSkyData[basic_offset]); - *pix = temp.mAll; + *pix = temp.asRGBA(); } } createGLImage(sCurrent); |