From 5d844d2646166fe112bc58362b7dfd4e24fa76ec Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 29 May 2019 08:12:49 -0700 Subject: SL-11247 Fix underwater water fog density modifier being used when not underwater. --- indra/newview/llsettingsvo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 11d7eb1c35..00acb78c45 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); -- cgit v1.2.3