diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-19 11:31:44 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-19 11:31:44 -0500 |
| commit | 6c061ae4fd3c5de9a73035855180df2b26dae3dd (patch) | |
| tree | 4d46d86d34e4abd2f3f57481fda67dcec335ba66 /indra/newview/llviewerdisplay.cpp | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
| parent | b49594662573959e0d7ccc08a2b266b3abc8130e (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rwxr-xr-x | 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 b07fe39e37..f90b35a7bd 100755 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -673,6 +673,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) static LLCullResult result; LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WORLD; + LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater() ? TRUE : FALSE; gPipeline.updateCull(*LLViewerCamera::getInstance(), result, water_clip); stop_glerror(); @@ -879,7 +880,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) //} LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater() ? TRUE : FALSE; - + LLGLState::checkStates(); LLGLState::checkClientArrays(); |