diff options
| author | JJ Linden <jj@lindenlab.com> | 2013-05-15 14:57:56 -0700 |
|---|---|---|
| committer | JJ Linden <jj@lindenlab.com> | 2013-05-15 14:57:56 -0700 |
| commit | a606a1cd68bd858c711856702185ae11194c6311 (patch) | |
| tree | 2c060215b7ddc02492d715cae6b48d5f3c26f335 /indra/newview/llwlparammanager.cpp | |
| parent | 435bda9df464ef7faaf8329ffa094dca9e82a6a4 (diff) | |
| parent | 50e3b7da42ddbae409f0a2bdbc322da96941fa07 (diff) | |
merged in branch for changing BuildParams
Diffstat (limited to 'indra/newview/llwlparammanager.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llwlparammanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp index 6077208799..04d41a2512 100644..100755 --- a/indra/newview/llwlparammanager.cpp +++ b/indra/newview/llwlparammanager.cpp @@ -352,7 +352,7 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader) if (shader->mShaderGroup == LLGLSLShader::SG_DEFAULT) { shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, mRotatedLightDir.mV); - shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV); + shader->uniform3fv(LLShaderMgr::WL_CAMPOSLOCAL, 1, LLViewerCamera::getInstance()->getOrigin().mV); } else if (shader->mShaderGroup == LLGLSLShader::SG_SKY) @@ -360,7 +360,7 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader) shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, mClampedLightDir.mV); } - shader->uniform1f("scene_light_strength", mSceneLightStrength); + shader->uniform1f(LLShaderMgr::SCENE_LIGHT_STRENGTH, mSceneLightStrength); } |