1 files changed, 2 insertions, 12 deletions
diff --git a/indra/newview/llsurface.h b/indra/newview/llsurface.h
index 324296a4d3..10a104730b 100644
--- a/indra/newview/llsurface.h
+++ b/indra/newview/llsurface.h
@@ -110,6 +110,7 @@ public:
     LLSurfacePatch *resolvePatchRegion(const F32 x, const F32 y) const;
     LLSurfacePatch *resolvePatchRegion(const LLVector3 &position_region) const;
     LLSurfacePatch *resolvePatchGlobal(const LLVector3d &position_global) const;
+    LLSurfacePatch *getPatch(const S32 x, const S32 y) const;
 
     // Update methods (called during idle, normally)
     template<bool PBR>
@@ -128,7 +129,7 @@ public:
     F32 getWaterHeight() const;
 
     LLViewerTexture *getSTexture();
-    LLViewerTexture *getWaterTexture();
+
     bool hasZData() const                           { return mHasZData; }
 
     void dirtyAllPatches(); // Use this to dirty all patches when changing terrain parameters
@@ -171,21 +172,11 @@ public:
 
 protected:
     void createSTexture();
-    void createWaterTexture();
     void initTextures();
-    void initWater();
-
 
     void createPatchData();     // Allocates memory for patches.
     void destroyPatchData();    // Deallocates memory for patches.
 
-    bool generateWaterTexture(const F32 x, const F32 y,
-                        const F32 width, const F32 height);     // Generate texture from composition values.
-
-    //F32 updateTexture(LLSurfacePatch *ppatch);
-
-    LLSurfacePatch *getPatch(const S32 x, const S32 y) const;
-
 protected:
     LLVector3d  mOriginGlobal;      // In absolute frame
     LLSurfacePatch *mPatchList;     // Array of all patches
@@ -201,7 +192,6 @@ protected:
 
     // The textures should never be directly initialized - use the setter methods!
     LLPointer<LLViewerTexture> mSTexturep;      // Texture for surface
-    LLPointer<LLViewerTexture> mWaterTexturep;  // Water texture
 
     LLPointer<LLVOWater>    mWaterObjp;