diff options
| author | Richard Linden <none@none> | 2013-01-11 10:27:03 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-11 10:27:03 -0800 |
| commit | 17c051f965e05a8a91d4a93b641084869897fe71 (patch) | |
| tree | 1227bfab5e2039b2d78061adbd549e8481ce4fdc /indra/newview/llvowater.cpp | |
| parent | 62a9f557d2e91beb685843775e8f9fe73dab4b94 (diff) | |
| parent | efa6be575c184a885d2b7e6f2142db6777668343 (diff) | |
Automated merge with file:///c:%5Ccode%5Cviewer-interesting-metrics
Diffstat (limited to 'indra/newview/llvowater.cpp')
| -rw-r--r-- | indra/newview/llvowater.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp index e8a1c3d1d6..50e7ed7bb5 100644 --- a/indra/newview/llvowater.cpp +++ b/indra/newview/llvowater.cpp @@ -298,15 +298,15 @@ U32 LLVOVoidWater::getPartitionType() const return LLViewerRegion::PARTITION_VOIDWATER; } -LLWaterPartition::LLWaterPartition() -: LLSpatialPartition(0, FALSE, GL_DYNAMIC_DRAW_ARB) +LLWaterPartition::LLWaterPartition(LLViewerRegion* regionp) +: LLSpatialPartition(0, FALSE, GL_DYNAMIC_DRAW_ARB, regionp) { mInfiniteFarClip = TRUE; mDrawableType = LLPipeline::RENDER_TYPE_WATER; mPartitionType = LLViewerRegion::PARTITION_WATER; } -LLVoidWaterPartition::LLVoidWaterPartition() +LLVoidWaterPartition::LLVoidWaterPartition(LLViewerRegion* regionp) : LLWaterPartition(regionp) { mOcclusionEnabled = FALSE; mDrawableType = LLPipeline::RENDER_TYPE_VOIDWATER; |