diff options
| author | Richard Linden <none@none> | 2013-01-11 13:15:39 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-11 13:15:39 -0800 |
| commit | a3d07fd4c27e527edfb901b25b5857d3fd7d2eaf (patch) | |
| tree | 306b27137fe029cafe4d65f0c24fc65820e1ab9a /indra/newview/llvowater.cpp | |
| parent | dd54893bcf50f41e5c678b6ca67b646284b94fca (diff) | |
| parent | 17c051f965e05a8a91d4a93b641084869897fe71 (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; |