diff options
author | Dave Parks <davep@lindenlab.com> | 2011-08-11 14:20:57 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-08-11 14:20:57 -0500 |
commit | 80398b3ccb0c4a6ff3ac20b3565619fe5cecc2f9 (patch) | |
tree | 623156a93d159ece460a31590701d7cbdc701cdc /indra/newview/lldrawpoolwlsky.cpp | |
parent | 610764fbfce75f54c95d4b10c2a8f9482a7a7b80 (diff) | |
parent | 2dd8ce53e4e0d14f2bc20796eb6bdf1ef12a65df (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; } |