1 files changed, 11 insertions, 23 deletions

diff --git a/linden/indra/newview/llsurfacepatch.cpp b/linden/indra/newview/llsurfacepatch.cpp
index 04b732a..5fac5fd 100644
--- a/linden/indra/newview/llsurfacepatch.cpp
+++ b/linden/indra/newview/llsurfacepatch.cpp
@@ -712,7 +712,17 @@ BOOL LLSurfacePatch::updateTexture()
                                 if (mVObjp)
                                 {
                                         mVObjp->dirtyGeom();
-                                        gPipeline.markGLRebuild(mVObjp);
+                                }
+                                updateCompositionStats();
+                                F32 tex_patch_size = meters_per_grid*grids_per_patch_edge;
+                                if (comp->generateTexture((F32)origin_region[VX], (F32)origin_region[VY],
+                                                                                  tex_patch_size, tex_patch_size))
+                                {
+                                        mSTexUpdate = FALSE;
+
+                                        // Also generate the water texture
+                                        mSurfacep->generateWaterTexture((F32)origin_region.mdV[VX], (F32)origin_region.mdV[VY],
+                                                                                                        tex_patch_size, tex_patch_size);
                                         return TRUE;
                                 }
                         }
@@ -725,28 +735,6 @@ BOOL LLSurfacePatch::updateTexture()
         }
 }
 
-void LLSurfacePatch::updateGL() // KL SD
-{
-        F32 meters_per_grid = getSurface()->getMetersPerGrid();
-        F32 grids_per_patch_edge = (F32)getSurface()->getGridsPerPatchEdge();
-
-        LLViewerRegion *regionp = getSurface()->getRegion();
-        LLVector3d origin_region = getOriginGlobal() - getSurface()->getOriginGlobal();
-
-        LLVLComposition* comp = regionp->getComposition();
-        
-        updateCompositionStats();
-        F32 tex_patch_size = meters_per_grid*grids_per_patch_edge;
-        if (comp->generateTexture((F32)origin_region[VX], (F32)origin_region[VY],
-                                                          tex_patch_size, tex_patch_size))
-        {
-                mSTexUpdate = FALSE;
-
-                // Also generate the water texture
-                mSurfacep->generateWaterTexture((F32)origin_region.mdV[VX], (F32)origin_region.mdV[VY],
-                                                                                tex_patch_size, tex_patch_size);
-        }
-}  // KL
 
 void LLSurfacePatch::dirtyZ()
 {