diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
| commit | 6a9e70053beaa0fb936482f5594137a8bcdf2f1e (patch) | |
| tree | 9f6a44825ed0886807c4b38d9a92188261bbaf25 /indra/newview/llviewerdisplay.cpp | |
| parent | 4902a2752e6ee5dfd47be3d94955f88bf73bf5d8 (diff) | |
| parent | accbddaeadeec7221c9244bf1c0245b8ccbd12bc (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()) { |