summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-05-28 16:11:04 -0700
committerGraham Linden <graham@lindenlab.com>2019-05-28 16:11:04 -0700
commit47ceaa3d0989c8010f960f9e600d9cf0b7a2048a (patch)
tree065b2ff7b52415833942be8488f744c21cd40b10 /indra
parent3d9bd0fb8291ad3de4aaa20100149bd45680538b (diff)
SL-11247
Make underwater modifier not applied when not underwater.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llsettingsvo.cpp2
1 files changed, 1 insertions, 1 deletions
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);