diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-27 15:08:21 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-27 15:08:21 -0400 |
| commit | 225ffbba205e832b75bed3492428ae3a0c8c7404 (patch) | |
| tree | 510681690c0c3c5e2504739453873c7ed701c658 /indra/newview/llviewerdisplay.cpp | |
| parent | 1aee2f0d4d16548660df4995aaf3c349304962af (diff) | |
| parent | a7143a9998f2a69d323d384558e078b05e9a73a2 (diff) | |
Automated merge up 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 81acca4fc3..88bf2006f9 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -584,7 +584,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()) { |