From 47ceaa3d0989c8010f960f9e600d9cf0b7a2048a Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 28 May 2019 16:11:04 -0700
Subject: [PATCH] SL-11247
Make underwater modifier not applied when not underwater.
---
indra/newview/llsettingsvo.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 11d7eb1c355..00acb78c457 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -936,7 +936,7 @@ void LLSettingsVOWater::applySpecial(void *ptarget)
shader->uniform1f(LLShaderMgr::WATER_FOGKS, waterFogKS);
F32 eyedepth = LLViewerCamera::getInstance()->getOrigin().mV[2] - water_height;
- bool underwater = LLPipeline::sUnderWaterRender || (eyedepth <= 0.0f);
+ bool underwater = (eyedepth <= 0.0f);
F32 waterFogDensity = env.getCurrentWater()->getModifiedWaterFogDensity(underwater);
shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, waterFogDensity);
--
GitLab