diff options
| author | callum_linden <none@none> | 2013-06-28 13:36:41 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2013-06-28 13:36:41 -0700 |
| commit | bd41392b7ec1dd90cd0039d87bbbef8beda1796a (patch) | |
| tree | aa01ba89c055c5ed427c25227f894fd41b55a220 /indra/newview/llviewerdisplay.cpp | |
| parent | 4696eeeb30ce4d01c3bcbe74c9024f05d848968a (diff) | |
| parent | b6b4b5913827ca864dac94c72a127f520288ef8e (diff) | |
Merge with viewer-bear which was just merged 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 eb7b467855..422f18566f 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(); |