diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-21 16:50:00 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-21 16:50:00 -0700 |
| commit | f15ee2c965a8bfebc9d7b30fb7b42d653c6f88ed (patch) | |
| tree | 73449b72a5216641078c24a416965786b7259d96 /indra/newview/llvosky.cpp | |
| parent | b94df67b1f349d77cb108fe169c94d873a193099 (diff) | |
| parent | a02b3500b9979c10336eb13674279b3c07367445 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvosky.cpp')
| -rw-r--r-- | indra/newview/llvosky.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 7c1fda46ff..4c84e40c73 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -389,7 +389,7 @@ LLVOSky::LLVOSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) mSun.setIntensity(SUN_INTENSITY); mMoon.setIntensity(0.1f * SUN_INTENSITY); - mBloomTexturep = LLViewerTextureManager::getFetchedTexture(IMG_BLOOM1); + mBloomTexturep = LLViewerTextureManager::getFetchedTexture(LLSettingsSky::GetDefaultBloomTextureId()); mBloomTexturep->setNoDelete() ; mBloomTexturep->setAddressMode(LLTexUnit::TAM_CLAMP); @@ -488,7 +488,7 @@ void LLVOSky::restoreGL() setMoonTextures(psky->getMoonTextureId(), psky->getNextMoonTextureId()); } - mBloomTexturep = LLViewerTextureManager::getFetchedTexture(IMG_BLOOM1); + mBloomTexturep = LLViewerTextureManager::getFetchedTexture(LLSettingsSky::GetDefaultBloomTextureId()); mBloomTexturep->setNoDelete() ; mBloomTexturep->setAddressMode(LLTexUnit::TAM_CLAMP); |