diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-01 21:53:44 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-01 21:53:44 +0000 |
| commit | 6eb180f790c248005bafb8cfb87bb5f575ee129e (patch) | |
| tree | 0cd461cd6304901f2a82db8d6f40593771343985 /indra/newview/lldrawpoolwater.cpp | |
| parent | e1627330c9d568abca65c2451919c5a6e55dfec3 (diff) | |
| parent | 8b4a86db298335de52db114d63a153808dfde36a (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #261)
SL-9996, SL-1130, SL-5546
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index c674d9a576..23749d7adb 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -592,6 +592,7 @@ void LLDrawPoolWater::shade2(bool edge, LLGLSLShader* shader, const LLColor3& li shader->uniform1f(LLShaderMgr::WATER_SUN_ANGLE, sunAngle); shader->uniform1f(LLShaderMgr::WATER_SCALED_ANGLE, scaledAngle); shader->uniform1f(LLShaderMgr::WATER_SUN_ANGLE2, 0.1f + 0.2f*sunAngle); + shader->uniform1i(LLShaderMgr::WATER_EDGE_FACTOR, edge ? 1 : 0); LLColor4 water_color; LLVector3 camera_up = LLViewerCamera::getInstance()->getUpAxis(); |