diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-08-02 10:51:11 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-08-02 10:51:11 -0400 |
| commit | acda43ed3881eeab60ee9edfdf76ac8eebd723cc (patch) | |
| tree | f59c0d1a12f7a3b0dc14498a9a0f57e2a8f66ef5 /indra/newview/llviewerdisplay.cpp | |
| parent | 32a953f65eae51850bad1b2c4c2a63d3dff12a68 (diff) | |
| parent | 0906d000b36d4da2116e0b9347a37598c918ce08 (diff) | |
CHOP-959: merge --graphicslevel fix up to tip
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(); |