diff options
author | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:39:02 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:39:02 -0500 |
commit | f076bdf609ec1fe114a7d0222a318483c97c7a26 (patch) | |
tree | 93dbd2a949d60daaf6aaa025ca7cf036cf90a929 /indra/newview/lldrawpoolwlsky.cpp | |
parent | f302e119627090c22325df59c40e1762402a08c6 (diff) | |
parent | b9439ac006ac64179180ec2a47f6bd92468de455 (diff) |
merge
Diffstat (limited to 'indra/newview/lldrawpoolwlsky.cpp')
-rw-r--r-- | indra/newview/lldrawpoolwlsky.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp index 79a835fd14..e4de92490e 100644 --- a/indra/newview/lldrawpoolwlsky.cpp +++ b/indra/newview/lldrawpoolwlsky.cpp @@ -100,12 +100,12 @@ void LLDrawPoolWLSky::beginRenderPass( S32 pass ) { sky_shader = LLPipeline::sUnderWaterRender ? - &gObjectSimpleWaterProgram : + &gObjectFullbrightNoColorWaterProgram : &gWLSkyProgram; cloud_shader = LLPipeline::sUnderWaterRender ? - &gObjectSimpleWaterProgram : + &gObjectFullbrightNoColorWaterProgram : &gWLCloudProgram; } |