diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-01 15:19:50 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-01 15:19:50 -0700 |
| commit | 9b457982305c624468aa32e06a1c0df713d0b53c (patch) | |
| tree | f6a8787782355e3ea083326ff3e1ea4ad4bc8873 /indra/newview/llviewerdisplay.cpp | |
| parent | 6ab2e44e945ddc085a7b4b5f1524de924419a897 (diff) | |
| parent | 42b49397d2347b6a97394ce0b35efe5cc2ab44a2 (diff) | |
Merge
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()) { |