diff options
| author | simon <simon@lindenlab.com> | 2024-01-09 20:22:37 +0000 |
|---|---|---|
| committer | simon <simon@lindenlab.com> | 2024-01-09 20:22:37 +0000 |
| commit | a9ef4d2ee8470e944b09402d0f796cb09cdb728d (patch) | |
| tree | 4a5b4299c352e671b7aa76eabbf00d546acbf670 /indra/newview/lldrawpoolavatar.cpp | |
| parent | eca0021b7dfd40d5b573ae5530cf44edbe3a0994 (diff) | |
| parent | 77395eddc911e0801e50fd693f7bbaee8046aa95 (diff) | |
Merge remote-tracking branch 'origin/main' into simon/sl-20635-new-data
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 |