diff options
| author | Tofu Buzzard <no-email> | 2010-10-27 11:03:39 +0100 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-10-27 11:03:39 +0100 |
| commit | 179e9e37ecbdcd1ad2133733047707ddd42e8c30 (patch) | |
| tree | db3d1d07ea7e2c769562eeb2f5ad09587df376f6 /indra/newview/llviewerdisplay.cpp | |
| parent | 26700e0d40c5f650e713f5209dd80b5df84b2b5a (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()) { |