diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-04 09:47:26 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-04 09:47:26 -0700 |
| commit | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (patch) | |
| tree | adeadd5ef0b8c4514b325f74c3426b2af76e422b /indra/newview/lldrawpoolwlsky.cpp | |
| parent | f53b2bd880875b5194b6d298e1aad7d8951db9f3 (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
Pull merge of lindenlab/viewer-release
Diffstat (limited to 'indra/newview/lldrawpoolwlsky.cpp')
| -rwxr-xr-x | indra/newview/lldrawpoolwlsky.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp index 53339222eb..a98d3e6b05 100755 --- a/indra/newview/lldrawpoolwlsky.cpp +++ b/indra/newview/lldrawpoolwlsky.cpp @@ -152,7 +152,8 @@ void LLDrawPoolWLSky::renderDome(F32 camHeightLocal, LLGLSLShader * shader) cons gGL.translatef(0.f,-camHeightLocal, 0.f); // Draw WL Sky - shader->uniform3f("camPosLocal", 0.f, camHeightLocal, 0.f); + static LLStaticHashedString sCamPosLocal("camPosLocal"); + shader->uniform3f(sCamPosLocal, 0.f, camHeightLocal, 0.f); gSky.mVOWLSkyp->drawDome(); @@ -207,7 +208,8 @@ void LLDrawPoolWLSky::renderStars(void) const if (LLGLSLShader::sNoFixedFunction) { gCustomAlphaProgram.bind(); - gCustomAlphaProgram.uniform1f("custom_alpha", star_alpha.mV[3]); + static LLStaticHashedString sCustomAlpha("custom_alpha"); + gCustomAlphaProgram.uniform1f(sCustomAlpha, star_alpha.mV[3]); } else { |