diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-05 21:44:23 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-05 21:44:23 +0000 |
| commit | fc5a30a6949e6127a27f9bbadb51a287195145f6 (patch) | |
| tree | 182ada6abf5bc3655bee7647883b2659aa12b9a1 /indra/newview/llvosky.cpp | |
| parent | b030d7036f87d30babb4a8df8d256113f46182e9 (diff) | |
| parent | 5eed233618abd7020e130799be2abe0f986543f6 (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #134)
SL-1925
Diffstat (limited to 'indra/newview/llvosky.cpp')
| -rw-r--r-- | indra/newview/llvosky.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 705e382a99..7564a5003b 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -429,7 +429,7 @@ LLVOSky::LLVOSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) mHeavenlyBodyUpdated = FALSE ; mDrawRefl = 0; - mInterpVal = 0.f; + mInterpVal = 0.f; } @@ -492,6 +492,9 @@ void LLVOSky::init() mInitialized = true; mHeavenlyBodyUpdated = FALSE ; + + mRainbowMap = LLViewerTextureManager::getFetchedTexture(psky->getRainbowTextureId(), FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); + mHaloMap = LLViewerTextureManager::getFetchedTexture(psky->getHaloTextureId(), FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); } void LLVOSky::initCubeMap() |