From d07ba61a850d926eda3e6a9abe54465c7a462676 Mon Sep 17 00:00:00 2001 From: "Graham Madarasz (Graham)" Date: Thu, 11 Jul 2013 16:42:14 -0700 Subject: NORSPEC-291 really fix missing avatar --- indra/newview/lldrawpoolavatar.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 86776b7e42..59c9cf5a83 100755 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -299,10 +299,10 @@ void LLDrawPoolAvatar::beginDeferredRiggedMaterialAlpha(S32 pass) sVertexProgram = &gDeferredMaterialProgram[pass]; - //if (LLPipeline::sUnderWaterRender) - //{ - // sVertexProgram = &(gDeferredMaterialWaterProgram[pass]); - //} + if (LLPipeline::sUnderWaterRender) + { + sVertexProgram = &(gDeferredMaterialWaterProgram[pass]); + } gPipeline.bindDeferredShader(*sVertexProgram); sDiffuseChannel = sVertexProgram->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP); @@ -1099,10 +1099,10 @@ void LLDrawPoolAvatar::beginDeferredRiggedMaterial(S32 pass) } sVertexProgram = &gDeferredMaterialProgram[pass+LLMaterial::SHADER_COUNT]; - //if (LLPipeline::sUnderWaterRender) - //{ - // sVertexProgram = &(gDeferredMaterialWaterProgram[pass]); - //} + if (LLPipeline::sUnderWaterRender) + { + sVertexProgram = &(gDeferredMaterialWaterProgram[pass+LLMaterial::SHADER_COUNT]); + } sVertexProgram->bind(); normal_channel = sVertexProgram->enableTexture(LLViewerShaderMgr::BUMP_MAP); -- cgit v1.2.3