aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvosurfacepatch.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llvosurfacepatch.cpp18
1 files changed, 13 insertions, 5 deletions
diff --git a/linden/indra/newview/llvosurfacepatch.cpp b/linden/indra/newview/llvosurfacepatch.cpp
index 1671880..7aa5739 100644
--- a/linden/indra/newview/llvosurfacepatch.cpp
+++ b/linden/indra/newview/llvosurfacepatch.cpp
@@ -134,7 +134,7 @@ void LLVOSurfacePatch::setPixelAreaAndAngle(LLAgent &agent)
134} 134}
135 135
136 136
137void LLVOSurfacePatch::updateTextures() 137void LLVOSurfacePatch::updateTextures(LLAgent &agent)
138{ 138{
139} 139}
140 140
@@ -177,11 +177,19 @@ LLDrawable *LLVOSurfacePatch::createDrawable(LLPipeline *pipeline)
177} 177}
178 178
179 179
180void LLVOSurfacePatch::updateGL()
181{
182 if (mPatchp)
183 {
184 mPatchp->updateGL();
185 }
186}
187
180BOOL LLVOSurfacePatch::updateGeometry(LLDrawable *drawable) 188BOOL LLVOSurfacePatch::updateGeometry(LLDrawable *drawable)
181{ 189{
182 LLFastTimer ftm(LLFastTimer::FTM_UPDATE_TERRAIN); 190 LLFastTimer ftm(LLFastTimer::FTM_UPDATE_TERRAIN);
183 191
184 dirtySpatialGroup(); 192 dirtySpatialGroup(TRUE);
185 193
186 S32 min_comp, max_comp, range; 194 S32 min_comp, max_comp, range;
187 min_comp = lltrunc(mPatchp->getMinComposition()); 195 min_comp = lltrunc(mPatchp->getMinComposition());
@@ -1013,12 +1021,12 @@ U32 LLVOSurfacePatch::getPartitionType() const
1013} 1021}
1014 1022
1015LLTerrainPartition::LLTerrainPartition() 1023LLTerrainPartition::LLTerrainPartition()
1016: LLSpatialPartition(LLDrawPoolTerrain::VERTEX_DATA_MASK) 1024: LLSpatialPartition(LLDrawPoolTerrain::VERTEX_DATA_MASK, FALSE, GL_DYNAMIC_DRAW_ARB)
1017{ 1025{
1018 mOcclusionEnabled = FALSE; 1026 mOcclusionEnabled = FALSE;
1019 mRenderByGroup = FALSE; 1027 //mRenderByGroup = FALSE; // KL not for SD hybrid code
1020 mInfiniteFarClip = TRUE; 1028 mInfiniteFarClip = TRUE;
1021 mBufferUsage = GL_DYNAMIC_DRAW_ARB; 1029 //mBufferUsage = GL_DYNAMIC_DRAW_ARB; // and here too!
1022 mDrawableType = LLPipeline::RENDER_TYPE_TERRAIN; 1030 mDrawableType = LLPipeline::RENDER_TYPE_TERRAIN;
1023 mPartitionType = LLViewerRegion::PARTITION_TERRAIN; 1031 mPartitionType = LLViewerRegion::PARTITION_TERRAIN;
1024} 1032}