diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-15 11:41:00 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-15 11:41:00 -0400 |
| commit | 402a2de7651105d63693deb2872dd6646dd1bd85 (patch) | |
| tree | 5b0935f876e954a024227355c34a2c23eebe1b8d /indra/newview/llvowater.cpp | |
| parent | 60d15f78e17a2203d73d58c3f1c2af941d599277 (diff) | |
| parent | 6b70273603e4aa807662c301179d05a1f2f5a224 (diff) | |
merging latest viewer-mesh into nyx's sidebranch
Diffstat (limited to 'indra/newview/llvowater.cpp')
| -rw-r--r-- | indra/newview/llvowater.cpp | 6 |
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; } |