diff options
| author | Anchor <none@none> | 2019-04-10 11:47:57 -0700 |
|---|---|---|
| committer | Anchor <none@none> | 2019-04-10 11:47:57 -0700 |
| commit | 4b1c786c6e7236d45be33bbf216be142dbfa33c2 (patch) | |
| tree | e414dd7a512d6d885b3f6e1ac2ea236ec4e82619 /indra/newview/llviewerdisplay.cpp | |
| parent | 83fe55c429181a2adb67346db79becf00d501536 (diff) | |
| parent | 5cf18cb867be567bf921f0b94a78fd822e4112ad (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 86a9e7e2ad..64f6123f5d 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -689,7 +689,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; + LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater(); gPipeline.updateCull(*LLViewerCamera::getInstance(), result, water_clip); stop_glerror(); @@ -899,7 +899,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) // gGL.popMatrix(); //} - LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater() ? TRUE : FALSE; + LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater(); LLGLState::checkStates(); LLGLState::checkClientArrays(); |