diff options
author | Rider Linden <rider@lindenlab.com> | 2019-02-08 22:10:07 +0000 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2019-02-08 22:10:07 +0000 |
commit | a1c2d021261d38de7dabd0863dd264ac3bf50523 (patch) | |
tree | 3b09e4412ccac313dd93adff2d14d1c766b5686a /indra/newview/lldrawpoolwlsky.cpp | |
parent | c8d8414b3b2e83fbaffd6e48f55ca14a3cb27ca4 (diff) | |
parent | 0a7bc35335666cc310ef900d4e4144c658b92522 (diff) |
Merged in graham_linden/viewer-eep-fixes (pull request #273)
SL-10478, SL-10486, SL-10501, SL-10415, SL-10487
Diffstat (limited to 'indra/newview/lldrawpoolwlsky.cpp')
-rw-r--r-- | indra/newview/lldrawpoolwlsky.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp index acf2a6ea6e..313e74d5cd 100644 --- a/indra/newview/lldrawpoolwlsky.cpp +++ b/indra/newview/lldrawpoolwlsky.cpp @@ -701,6 +701,7 @@ void LLDrawPoolWLSky::renderHeavenlyBodies() F32 moon_brightness = (float)psky->getMoonBrightness(); moon_shader->uniform1f(LLShaderMgr::MOON_BRIGHTNESS, moon_brightness); + moon_shader->uniform4fv(LLShaderMgr::MOONLIGHT_COLOR, 1, gSky.mVOSkyp->getMoon().getColor().mV); moon_shader->uniform4fv(LLShaderMgr::DIFFUSE_COLOR, 1, color.mV); moon_shader->uniform1f(LLShaderMgr::BLEND_FACTOR, blend_factor); |