diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-21 21:25:15 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-21 21:25:15 +0100 |
| commit | 52b946fd09196989e34afd7226a82060c4f8d831 (patch) | |
| tree | cd176f75a51b1c0cfb578a6de8c8271814f58726 /indra/newview/llvosky.cpp | |
| parent | 2c0583a2719faabd32415782e2326858e0557d0e (diff) | |
Fix double-def of IMG_BLOOM1 from pulling over server change not needed in viewer code.
Make viewer code use LLSettingsSky static func to hide indraconstants dep.
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); |