diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-26 10:59:37 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-26 10:59:37 -0700 |
| commit | ebce1a4ea8dedcef25c82fa5d877d780b12a3a8f (patch) | |
| tree | 60af20175edacbcbea2b8c75d2ca4baba9d36012 /indra/newview/llviewerdisplay.cpp | |
| parent | a40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff) | |
| parent | 235980dfe3f5683c7871285888001740c1c5d66f (diff) | |
STORM-416 : merge with 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()) { |