diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-03-20 16:10:10 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-03-20 16:10:10 +0000 |
| commit | fa6e4137e39f9adac8696af688d0f6f28f6cb29d (patch) | |
| tree | bb8d7caa122850d4ef4c18a9846a55504960d010 /indra/newview/lldrawpoolwater.cpp | |
| parent | b1999722be317f2b293ad3e4a68310a82a467fc0 (diff) | |
| parent | 2d514e4b10025dc37c20db7db821e621dcdcaaf1 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #305)
SL-10764, SL-10768. SL-10763
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | 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 abda2d45fb..4c95fb0a0f 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -271,9 +271,9 @@ void LLDrawPoolWater::render(S32 pass) glDisable(GL_TEXTURE_GEN_S); //texture unit 1 glDisable(GL_TEXTURE_GEN_T); //texture unit 1 - gGL.getTexUnit(1)->activate(); - gGL.getTexUnit(1)->unbind(LLTexUnit::TT_TEXTURE); - gGL.getTexUnit(1)->disable(); + gGL.getTexUnit(2)->activate(); + gGL.getTexUnit(2)->unbind(LLTexUnit::TT_TEXTURE); + gGL.getTexUnit(2)->disable(); glDisable(GL_TEXTURE_GEN_S); //texture unit 1 glDisable(GL_TEXTURE_GEN_T); //texture unit 1 |