diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-13 00:51:39 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-13 00:51:39 +0100 |
| commit | 34865c4bb5cd12219606f44748159fe7cbeea264 (patch) | |
| tree | 909e247267325a55a468635ecfc7957cefc23868 /indra/newview/llvosky.cpp | |
| parent | e2adba65debbd1550a9eaead2a00e1426e8855a8 (diff) | |
Mods to hook up water settings to water normals for rendering with support for current to next blending.
Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings.
Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).
Diffstat (limited to 'indra/newview/llvosky.cpp')
| -rw-r--r-- | indra/newview/llvosky.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index e8ca286074..c73b5041c0 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -74,11 +74,6 @@ static const LLVector2 TEX11 = LLVector2(1.f, 1.f); static const F32 LIGHT_DIRECTION_THRESHOLD = (F32) cosf(DEG_TO_RAD * 1.f); static const F32 COLOR_CHANGE_THRESHOLD = 0.01f; -// LAPRAS -// Exported globals -//LLUUID gSunTextureID = IMG_SUN; -//LLUUID gMoonTextureID = IMG_MOON; - /*************************************** SkyTex ***************************************/ @@ -388,11 +383,6 @@ LLVOSky::LLVOSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) mSun.setIntensity(SUN_INTENSITY); mMoon.setIntensity(0.1f * SUN_INTENSITY); - //mSunTexturep = LLViewerTextureManager::getFetchedTexture(gSunTextureID, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); - //mSunTexturep->setAddressMode(LLTexUnit::TAM_CLAMP); - //mMoonTexturep = LLViewerTextureManager::getFetchedTexture(gMoonTextureID, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); - //mMoonTexturep->setAddressMode(LLTexUnit::TAM_CLAMP); - mBloomTexturep = LLViewerTextureManager::getFetchedTexture(IMG_BLOOM1); mBloomTexturep->setNoDelete() ; mBloomTexturep->setAddressMode(LLTexUnit::TAM_CLAMP); |