diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-04-02 12:27:34 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-04-02 12:27:34 -0700 |
| commit | d78ed764b538cf0fa0eba3e39fbbf99ef059660a (patch) | |
| tree | 5f19fcdd4826e15c39ca70f3f6b3a7aee22e4a69 /indra/newview/llviewerdisplay.cpp | |
| parent | 14629ca3d661c8ec798ad072c4e739571d9c1196 (diff) | |
| parent | 5cf18cb867be567bf921f0b94a78fd822e4112ad (diff) | |
Merge 6.1.2 LoveMeRender new hotness
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(); |