diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-16 11:50:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-16 11:50:03 -0400 |
| commit | cf33a9a7b31b19d0f87e11997aaba938a8ee950d (patch) | |
| tree | f64996ebb904ec562447be92b2e5273b9261d41c /indra/newview/llviewerdisplay.cpp | |
| parent | 1108cd0e5c052176f9dacc69b04d702a06b744de (diff) | |
| parent | e12b6caaa0596eae2fad43636663dd4e14a1949c (diff) | |
merge changes for storm-1951
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(); |