diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-08 21:02:54 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-08 21:02:54 -0500 |
commit | 525a885c7c1de879a1e767a526ff2da44dd132be (patch) | |
tree | ecb142b08f8d46b67d65877407d5275ad6c02183 /indra/newview/lldrawpoolavatar.cpp | |
parent | f31dc5aa78887c48391bc98313d56013411c3167 (diff) | |
parent | 77395eddc911e0801e50fd693f7bbaee8046aa95 (diff) |
DRTVWR-589: Merge branch 'main' into DRTVWR-589.
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
-rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 342b76d93b..7f6409dbde 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -509,14 +509,7 @@ void LLDrawPoolAvatar::beginRigid() if (gPipeline.shadersLoaded()) { - if (LLPipeline::sUnderWaterRender) - { - sVertexProgram = &gObjectAlphaMaskNoColorWaterProgram; - } - else - { - sVertexProgram = &gObjectAlphaMaskNoColorProgram; - } + sVertexProgram = &gObjectAlphaMaskNoColorProgram; if (sVertexProgram != NULL) { //eyeballs render with the specular shader |