diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-04 18:06:29 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-04 18:06:29 -0600 |
| commit | 586025bde53ffcd160a9d169cca328ed5078f5f4 (patch) | |
| tree | 1f59d27d08567fd5f3fe02ce42fe6bae37bd3b2c /indra/newview/llwlparammanager.cpp | |
| parent | 3ee3c3ced32bd1e67a6bea51341734c8764df018 (diff) | |
| parent | 609ed855e1160505238378a1be49e2b92e8496f5 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/llwlparammanager.cpp')
| -rw-r--r-- | indra/newview/llwlparammanager.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp index 65cb80c3e7..04d41a2512 100644 --- a/indra/newview/llwlparammanager.cpp +++ b/indra/newview/llwlparammanager.cpp @@ -61,9 +61,6 @@ #include "curl/curl.h" #include "llstreamtools.h" -static LLStaticHashedString sCamPosLocal("camPosLocal"); -static LLStaticHashedString sSceneLightStrength("scene_light_strength"); - LLWLParamManager::LLWLParamManager() : //set the defaults for the controls @@ -355,7 +352,7 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader) if (shader->mShaderGroup == LLGLSLShader::SG_DEFAULT) { shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, mRotatedLightDir.mV); - shader->uniform3fv(sCamPosLocal, 1, LLViewerCamera::getInstance()->getOrigin().mV); + shader->uniform3fv(LLShaderMgr::WL_CAMPOSLOCAL, 1, LLViewerCamera::getInstance()->getOrigin().mV); } else if (shader->mShaderGroup == LLGLSLShader::SG_SKY) @@ -363,7 +360,7 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader) shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, mClampedLightDir.mV); } - shader->uniform1f(sSceneLightStrength, mSceneLightStrength); + shader->uniform1f(LLShaderMgr::SCENE_LIGHT_STRENGTH, mSceneLightStrength); } |