diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-30 01:26:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-30 01:26:27 -0500 |
| commit | 89473b2dc3ecfa8b813268833edddb5b0abd317d (patch) | |
| tree | 0252d59b1ee470ab36b0446da5c4d2e3827fbe1f /indra/newview/lldrawpooltree.cpp | |
| parent | 8c5fde7ae499a20c5cf2b51f575059dd01693ae8 (diff) | |
| parent | eca17c8993aecfd8d69c1b1765f8ac841ad29119 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpooltree.cpp')
| -rw-r--r-- | indra/newview/lldrawpooltree.cpp | 4 |
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()) |