diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-20 16:44:39 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-20 16:44:39 -0700 |
| commit | 2a03e8f9fb24bb68b79e34bcfa9a45d3e377b0b8 (patch) | |
| tree | b6d325cb77de72da605fc4fc032cf4970126ee14 /indra/newview/lldrawpoolwater.cpp | |
| parent | 8aadd9d27025e6ed8e50e88ec9548d48e48095c8 (diff) | |
MAINT-3172 fix rendering regressions from release mergedown
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rwxr-xr-x | indra/newview/lldrawpoolwater.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 32a9365aba..76e89b26e4 100755 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -696,10 +696,10 @@ void LLDrawPoolWater::shade() } } - shader->disableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP); + shader->disableTexture(LLShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP); shader->disableTexture(LLShaderMgr::WATER_SCREENTEX); - shader->disableTexture(LLViewerShaderMgr::BUMP_MAP); - shader->disableTexture(LLViewerShaderMgr::DIFFUSE_MAP); + shader->disableTexture(LLShaderMgr::BUMP_MAP); + shader->disableTexture(LLShaderMgr::DIFFUSE_MAP); shader->disableTexture(LLShaderMgr::WATER_REFTEX); shader->disableTexture(LLShaderMgr::WATER_SCREENDEPTH); |