summaryrefslogtreecommitdiff
path: root/indra/newview/llvowater.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-07-20 17:56:22 -0500
committerDave Parks <davep@lindenlab.com>2011-07-20 17:56:22 -0500
commit78f1bad0e66a172099b7f3ede033ea5576ee81e7 (patch)
tree994480b99b46c07c51023205968d7b3426cf42aa /indra/newview/llvowater.cpp
parent26568d5c984699b75cae209a652c43cb2303ba5f (diff)
SH-2021 Fix for black water at the horizon from occlusion culling madness.
Diffstat (limited to 'indra/newview/llvowater.cpp')
-rw-r--r--indra/newview/llvowater.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp
index 69ebad61ac..e70ac0a2e7 100644
--- a/indra/newview/llvowater.cpp
+++ b/indra/newview/llvowater.cpp
@@ -282,6 +282,11 @@ void LLVOWater::updateSpatialExtents(LLVector4a &newMin, LLVector4a& newMax)
U32 LLVOWater::getPartitionType() const
{
+ if (mIsEdgePatch)
+ {
+ return LLViewerRegion::PARTITION_VOIDWATER;
+ }
+
return LLViewerRegion::PARTITION_WATER;
}
@@ -300,6 +305,7 @@ LLWaterPartition::LLWaterPartition()
LLVoidWaterPartition::LLVoidWaterPartition()
{
+ mOcclusionEnabled = FALSE;
mDrawableType = LLPipeline::RENDER_TYPE_VOIDWATER;
mPartitionType = LLViewerRegion::PARTITION_VOIDWATER;
}