diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-16 13:49:35 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-16 13:49:35 -0400 |
| commit | 8379df21bce877897aec6c56f170b6e2ad11c7be (patch) | |
| tree | 908e3940d8c9624b1b0591567a35b2314ed6277c /indra/newview/llvowater.cpp | |
| parent | 6c61a537918b5cc73336885f8bdd34943fda2482 (diff) | |
| parent | f99cf295e1d7e297996d4ea32a2202273010d8a3 (diff) | |
merged .hgtags
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; } |