summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolwater.cpp
diff options
context:
space:
mode:
authorRunitai Linden <davep@lindenlab.com>2021-12-09 14:02:05 -0600
committerRunitai Linden <davep@lindenlab.com>2021-12-09 14:02:05 -0600
commitf475644bb1b49f0706bb34c59f4931f83bc11e81 (patch)
tree97703dda73c4fc995e81283ff9ecde6d620010fd /indra/newview/lldrawpoolwater.cpp
parent9689e606f4da78dd5654124b3e90913b4e934b1a (diff)
parent0a9ade4687dd53e9973ebfdf1ef948f04f5ac8c1 (diff)
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
-rw-r--r--indra/newview/lldrawpoolwater.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index 590385472b..62706feae3 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -679,9 +679,8 @@ void LLDrawPoolWater::renderWater()
{
face->renderIndexed();
- // If not occlusion culling, record non-void water being drawn
- // (If occlusion is enabled, these are set within LLOcclusionCullingGroup::checkOcclusion() )
- if (!edge && !LLPipeline::sUseOcclusion)
+ // Note non-void water being drawn, updates required
+ if (!edge) // SL-16461 remove !LLPipeline::sUseOcclusion check
{
sNeedsReflectionUpdate = TRUE;
sNeedsDistortionUpdate = TRUE;