diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-20 17:56:22 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-20 17:56:22 -0500 |
| commit | 78f1bad0e66a172099b7f3ede033ea5576ee81e7 (patch) | |
| tree | 994480b99b46c07c51023205968d7b3426cf42aa /indra/newview | |
| parent | 26568d5c984699b75cae209a652c43cb2303ba5f (diff) | |
SH-2021 Fix for black water at the horizon from occlusion culling madness.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvowater.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
2 files changed, 7 insertions, 1 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; } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 99f8a87b16..dfcc7396ba 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8029,7 +8029,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) static LLCullResult ref_result; - if (LLDrawPoolWater::sNeedsDistortionUpdate) + if (LLDrawPoolWater::sNeedsReflectionUpdate) { //initial sky pass (no user clip plane) { //mask out everything but the sky |