summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpooltree.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-06-21 11:47:58 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-06-21 11:47:58 -0400
commitfcf2ed5901699edfbc04d59d1a0517f19692df1a (patch)
tree3960aa76222776cb2b2dcd12fe1872850fc59ad7 /indra/newview/lldrawpooltree.cpp
parent3595216efbeb0210f6c5777fd85a589bbbb08e4c (diff)
parent4d77146b9016a4db37112e153e71c05c596f7fdc (diff)
merged .hgtags & BuildParams
Diffstat (limited to 'indra/newview/lldrawpooltree.cpp')
-rw-r--r--indra/newview/lldrawpooltree.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp
index 195ee60a2e..81c796b146 100644
--- a/indra/newview/lldrawpooltree.cpp
+++ b/indra/newview/lldrawpooltree.cpp
@@ -66,11 +66,11 @@ void LLDrawPoolTree::beginRenderPass(S32 pass)
if (LLPipeline::sUnderWaterRender)
{
- shader = &gObjectSimpleWaterProgram;
+ shader = &gObjectSimpleNonIndexedWaterProgram;
}
else
{
- shader = &gObjectSimpleProgram;
+ shader = &gObjectSimpleNonIndexedProgram;
}
if (gPipeline.canUseWindLightShadersOnObjects())