diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-07-26 08:59:37 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-07-26 08:59:37 -0400 |
| commit | f7cdbb2582d6328e62220dc4955c89bafcad5565 (patch) | |
| tree | 7542e74d37b066afdffcb0ba8e8cd01ff1d0a321 /indra/newview/llviewerdisplay.cpp | |
| parent | c109361861a9f96566ae4acbc2b42e6afd5180bf (diff) | |
| parent | 39bd14f3ca26c04072dcee68c5757232412f4014 (diff) | |
CHOP-962: merge code-review fixes with viewer-release
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(); |