diff options
| author | David Parks <davep@lindenlab.com> | 2009-09-22 11:11:45 +0000 |
|---|---|---|
| committer | David Parks <davep@lindenlab.com> | 2009-09-22 11:11:45 +0000 |
| commit | 536e38ad51b89808f26d8e3cd107fe093862d22a (patch) | |
| tree | 230159ae9e319f5c419f1a643177b2bbb17d52c5 /indra/newview/llvosurfacepatch.cpp | |
| parent | 760adead96e62cab8f9cdacc6469773a87dfbc1a (diff) | |
Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
Diffstat (limited to 'indra/newview/llvosurfacepatch.cpp')
| -rw-r--r-- | indra/newview/llvosurfacepatch.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp index 157d719fcc..164f0f0cad 100644 --- a/indra/newview/llvosurfacepatch.cpp +++ b/indra/newview/llvosurfacepatch.cpp @@ -178,11 +178,19 @@ LLDrawable *LLVOSurfacePatch::createDrawable(LLPipeline *pipeline) static LLFastTimer::DeclareTimer FTM_UPDATE_TERRAIN("Update Terrain"); +void LLVOSurfacePatch::updateGL() +{ + if (mPatchp) + { + mPatchp->updateGL(); + } +} + BOOL LLVOSurfacePatch::updateGeometry(LLDrawable *drawable) { LLFastTimer ftm(FTM_UPDATE_TERRAIN); - dirtySpatialGroup(); + dirtySpatialGroup(TRUE); S32 min_comp, max_comp, range; min_comp = lltrunc(mPatchp->getMinComposition()); @@ -1014,12 +1022,10 @@ U32 LLVOSurfacePatch::getPartitionType() const } LLTerrainPartition::LLTerrainPartition() -: LLSpatialPartition(LLDrawPoolTerrain::VERTEX_DATA_MASK) +: LLSpatialPartition(LLDrawPoolTerrain::VERTEX_DATA_MASK, FALSE, GL_DYNAMIC_DRAW_ARB) { mOcclusionEnabled = FALSE; - mRenderByGroup = FALSE; mInfiniteFarClip = TRUE; - mBufferUsage = GL_DYNAMIC_DRAW_ARB; mDrawableType = LLPipeline::RENDER_TYPE_TERRAIN; mPartitionType = LLViewerRegion::PARTITION_TERRAIN; } |