diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-04-03 14:53:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-04-03 14:53:49 -0700 |
| commit | 8f1e75071e081f1040a371cb2c1bc420befab948 (patch) | |
| tree | 18958414ed6e245e101de71a4439d2499e9dce80 /indra/newview/llviewerdisplay.cpp | |
| parent | e24237b6af504ff8faea02c8ab22344f2452364e (diff) | |
| parent | 82fbf642617444e0233e73d3bd5909c7c5285445 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 2e5807cab9..0862113999 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -688,7 +688,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(); |