Second Life viewer sources 1.14.0.0

1 files changed, 12 insertions, 2 deletions

diff --git a/linden/indra/newview/lldrawpoolwater.h b/linden/indra/newview/lldrawpoolwater.h
index 38bf6cf..2e45868 100644
--- a/linden/indra/newview/lldrawpoolwater.h
+++ b/linden/indra/newview/lldrawpoolwater.h
@@ -35,7 +35,7 @@ class LLFace;
 class LLHeavenBody;
 class LLWaterSurface;
 
-class LLDrawPoolWater: public LLDrawPool
+class LLDrawPoolWater: public LLFacePool
 {
 protected:
         LLPointer<LLViewerImage> mHBTex[2];
@@ -44,6 +44,16 @@ protected:
 
         const LLWaterSurface *mWaterSurface;
 public:
+        static BOOL sSkipScreenCopy;
+        enum
+        {
+                VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_NORMAL |
+                                                        LLVertexBuffer::MAP_TEXCOORD    
+        };
+
+        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+
         enum
         {
                 SHADER_LEVEL_RIPPLE = 2,
@@ -64,7 +74,7 @@ public:
         /*virtual*/ LLViewerImage *getDebugTexture();
         /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display
 
-        void renderReflection(const LLFace* face);
+        void renderReflection(LLFace* face);
         void shade();
         void renderShaderSimple();