diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-25 13:16:31 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-25 13:16:31 -0700 |
| commit | d31010512154ef1806281552f639e492bdde7fcd (patch) | |
| tree | 951ba65ec940f5bec236855490380cd43e74ebe7 /indra/newview/lldrawpoolwater.cpp | |
| parent | 089081dc802a8efb41d3eda7b2eec6f9637f1c4b (diff) | |
| parent | 571920c7b4fb8966088e769c630cda3c149c4e39 (diff) | |
Merge recent viewer-bear fixes that missed the boat
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); |