Applied patch by Aleric Inglewood for VWR-12984: Water flickers and disappears in patches, part 3: Collapse LL_VO_HOLE_WATER and LL_VO_EDGE_WATER into one LL_VO_VOID_WATER

1 files changed, 3 insertions, 2 deletions

diff --git a/linden/indra/newview/llvowater.h b/linden/indra/newview/llvowater.h
index 37480b6..55ce6d7 100644
--- a/linden/indra/newview/llvowater.h
+++ b/linden/indra/newview/llvowater.h
@@ -77,12 +77,13 @@ public:
         /*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 isEdgeWater(void) const { return mPrimitiveCode == LL_VO_EDGE_WATER; }
+        BOOL getIsEdgePatch() const { return mIsEdgePatch; }
 
 protected:
         BOOL mUseTexture;
+        BOOL mIsEdgePatch;
         LLPipeline::LLRenderTypeMask mRenderType;
 };