diff options
| author | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
| commit | 117e22047c5752352342d64e3fb7ce00a4eb8113 (patch) | |
| tree | e32de2cfba0dda8705ae528fcd1fbe23ba075685 /linden/indra/newview/lldrawpoolwater.cpp | |
| parent | Second Life viewer sources 1.18.0.6 (diff) | |
| download | meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.zip meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.gz meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.bz2 meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.xz | |
Second Life viewer sources 1.18.1.2
Diffstat (limited to 'linden/indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | linden/indra/newview/lldrawpoolwater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/lldrawpoolwater.cpp b/linden/indra/newview/lldrawpoolwater.cpp index 343f14c..100eb43 100644 --- a/linden/indra/newview/lldrawpoolwater.cpp +++ b/linden/indra/newview/lldrawpoolwater.cpp | |||
| @@ -595,7 +595,7 @@ void LLDrawPoolWater::shade() | |||
| 595 | glUniform1fARB(gWaterProgram.mUniform[LLShaderMgr::WATER_TIME], sTime); | 595 | glUniform1fARB(gWaterProgram.mUniform[LLShaderMgr::WATER_TIME], sTime); |
| 596 | glUniform3fvARB(gWaterProgram.mUniform[LLShaderMgr::WATER_SPECULAR], 1, light_diffuse.mV); | 596 | glUniform3fvARB(gWaterProgram.mUniform[LLShaderMgr::WATER_SPECULAR], 1, light_diffuse.mV); |
| 597 | glUniform1fARB(gWaterProgram.mUniform[LLShaderMgr::WATER_SPECULAR_EXP], light_exp); | 597 | glUniform1fARB(gWaterProgram.mUniform[LLShaderMgr::WATER_SPECULAR_EXP], light_exp); |
| 598 | glUniform3fvARB(gWaterProgram.mUniform[LLShaderMgr::WATER_EYEVEC], 1, gCamera->getOrigin().mV); | 598 | glUniform3fvARB(gWaterProgram.mUniform[LLShaderMgr::WATER_EYEVEC], 1, (GLfloat *)(gCamera->getOrigin().mV)); |
| 599 | glUniform2fvARB(gWaterProgram.mUniform[LLShaderMgr::WATER_WAVE_DIR1], 1, d1.mV); | 599 | glUniform2fvARB(gWaterProgram.mUniform[LLShaderMgr::WATER_WAVE_DIR1], 1, d1.mV); |
| 600 | glUniform2fvARB(gWaterProgram.mUniform[LLShaderMgr::WATER_WAVE_DIR2], 1, d2.mV); | 600 | glUniform2fvARB(gWaterProgram.mUniform[LLShaderMgr::WATER_WAVE_DIR2], 1, d2.mV); |
| 601 | glUniform3fvARB(gWaterProgram.mUniform[LLShaderMgr::WATER_LIGHT_DIR], 1, light_dir.mV); | 601 | glUniform3fvARB(gWaterProgram.mUniform[LLShaderMgr::WATER_LIGHT_DIR], 1, light_dir.mV); |