Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system"

This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d.

Conflicts:

	linden/indra/newview/llsurface.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/pipeline.h

1 files changed, 5 insertions, 13 deletions

diff --git a/linden/indra/newview/llvosurfacepatch.cpp b/linden/indra/newview/llvosurfacepatch.cpp
index 7aa5739..1671880 100644
--- a/linden/indra/newview/llvosurfacepatch.cpp
+++ b/linden/indra/newview/llvosurfacepatch.cpp
@@ -134,7 +134,7 @@ void LLVOSurfacePatch::setPixelAreaAndAngle(LLAgent &agent)
 }
 
 
-void LLVOSurfacePatch::updateTextures(LLAgent &agent)
+void LLVOSurfacePatch::updateTextures()
 {
 }
 
@@ -177,19 +177,11 @@ LLDrawable *LLVOSurfacePatch::createDrawable(LLPipeline *pipeline)
 }
 
 
-void LLVOSurfacePatch::updateGL()
-{
-        if (mPatchp)
-        {
-                mPatchp->updateGL();
-        }
-}
-
 BOOL LLVOSurfacePatch::updateGeometry(LLDrawable *drawable)
 {
         LLFastTimer ftm(LLFastTimer::FTM_UPDATE_TERRAIN);
 
-        dirtySpatialGroup(TRUE);
+        dirtySpatialGroup();
         
         S32 min_comp, max_comp, range;
         min_comp = lltrunc(mPatchp->getMinComposition());
@@ -1021,12 +1013,12 @@ U32 LLVOSurfacePatch::getPartitionType() const
 }
 
 LLTerrainPartition::LLTerrainPartition()
-: LLSpatialPartition(LLDrawPoolTerrain::VERTEX_DATA_MASK, FALSE, GL_DYNAMIC_DRAW_ARB)
+: LLSpatialPartition(LLDrawPoolTerrain::VERTEX_DATA_MASK)
 {
         mOcclusionEnabled = FALSE;
-        //mRenderByGroup = FALSE;  // KL not for SD hybrid code
+        mRenderByGroup = FALSE;
         mInfiniteFarClip = TRUE;
-        //mBufferUsage = GL_DYNAMIC_DRAW_ARB; // and here too!
+        mBufferUsage = GL_DYNAMIC_DRAW_ARB;
         mDrawableType = LLPipeline::RENDER_TYPE_TERRAIN;
         mPartitionType = LLViewerRegion::PARTITION_TERRAIN;
 }