diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:56:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:56:04 -0500 |
| commit | 11c6654479a299549dc0035faa894678a60e157e (patch) | |
| tree | 267ebd388c62f41b4b19e9eb3e777ba60e368dba /indra/newview/llwaterparammanager.cpp | |
| parent | a7aa89e2cb98c28be7b20bcae6dc1cb47f4d56c1 (diff) | |
| parent | c6acd4723526ed82e79dccef18aaf4821e53dfeb (diff) | |
merge changes for vmrg-227
Diffstat (limited to 'indra/newview/llwaterparammanager.cpp')
| -rw-r--r-- | indra/newview/llwaterparammanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp index 20b34637b8..e386112334 100644 --- a/indra/newview/llwaterparammanager.cpp +++ b/indra/newview/llwaterparammanager.cpp @@ -194,7 +194,7 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader) shader->uniform4fv("waterPlane", 1, mWaterPlane.mV); shader->uniform1f("waterFogDensity", getFogDensity()); shader->uniform1f("waterFogKS", mWaterFogKS); - shader->uniform4f("distance_multiplier", 0, 0, 0, 0); + shader->uniform1f("distance_multiplier", 0); } } |