1 files changed, 16 insertions, 4 deletions

diff --git a/linden/indra/newview/llvowater.h b/linden/indra/newview/llvowater.h
index 9c33e74..37480b6 100644
--- a/linden/indra/newview/llvowater.h
+++ b/linden/indra/newview/llvowater.h
@@ -35,6 +35,7 @@
 
 #include "llviewerobject.h"
 #include "llviewerimage.h"
+#include "pipeline.h"
 #include "v2math.h"
 
 const U32 N_RES = 16; //32                      // number of subdivisions of wave tile
@@ -71,18 +72,29 @@ public:
         /*virtual*/ void updateTextures();
         /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
 
-        virtual U32 getPartitionType() const;
+        /*virtual*/ U32 getPartitionType() const;
 
         /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate.
 
         void setUseTexture(const BOOL use_texture);
-        void setIsEdgePatch(const BOOL edge_patch);
         BOOL getUseTexture() const { return mUseTexture; }
-        BOOL getIsEdgePatch() const { return mIsEdgePatch; }
+
+        bool isEdgeWater(void) const { return mPrimitiveCode == LL_VO_EDGE_WATER; }
 
 protected:
         BOOL mUseTexture;
-        BOOL mIsEdgePatch;
+        LLPipeline::LLRenderTypeMask mRenderType;
+};
+
+class LLVOVoidWater : public LLVOWater
+{
+public:
+        LLVOVoidWater(LLUUID const& id, LLPCode pcode, LLViewerRegion* regionp) : LLVOWater(id, pcode, regionp)
+        {
+                mRenderType = LLPipeline::RENDER_TYPE_VOIDWATER;
+        }
+
+        /*virtual*/ U32 getPartitionType() const;
 };
 
 #endif // LL_VOSURFACEPATCH_H