diff options
| author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-27 09:04:27 -0400 |
|---|---|---|
| committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-27 09:04:27 -0400 |
| commit | ce34ba1b89a105e5f2f4902b2aebb486d16711e9 (patch) | |
| tree | 373b68976de2a260506615c6a1aa5380ffe15b22 /indra/newview/llviewerdisplay.cpp | |
| parent | 8bef9cc8137dc58b818c60dd1173959fcab40bd8 (diff) | |
| parent | 8947724baa6d595844daeee2f18c865d1886acc5 (diff) | |
Merge from viewer-development
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 6640e32cd2..d1cb9dabf1 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -573,7 +573,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) S32 water_clip = 0; if ((LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_ENVIRONMENT) > 1) && - gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_WATER)) + (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_WATER) || + gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_VOIDWATER))) { if (LLViewerCamera::getInstance()->cameraUnderWater()) { |