From 393c819477b268aa0a05ec0a006e1dba27d6e6c6 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Sun, 10 Oct 2010 15:25:11 +0100
Subject: VWR-21967 There's lots of ::renderForSelect() code that we don't need
 any more. VWR-22088 Remove underlying ::renderForSelect() code
 (render-pipeline)

---
 indra/newview/lldrawpoolwater.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/lldrawpoolwater.h')

diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h
index 3ab4bc5e2c..2648a5276c 100644
--- a/indra/newview/lldrawpoolwater.h
+++ b/indra/newview/lldrawpoolwater.h
@@ -74,7 +74,6 @@ public:
 	/*virtual*/ S32 getNumPasses();
 	/*virtual*/ void render(S32 pass = 0);
 	/*virtual*/ void prerender();
-	/*virtual*/ void renderForSelect();
 
 	/*virtual*/ LLViewerTexture *getDebugTexture();
 	/*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display
-- 
cgit v1.2.3


From ab42f31608a2abc0982119d6aebdb0972d41427f Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 5 Nov 2010 14:30:09 -0400
Subject: SH-410 Opaque Water Project version 2.0 First implementation with UI
 changes.

---
 indra/newview/lldrawpoolwater.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/lldrawpoolwater.h')

diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h
index 3ab4bc5e2c..dff1830129 100644
--- a/indra/newview/lldrawpoolwater.h
+++ b/indra/newview/lldrawpoolwater.h
@@ -39,6 +39,7 @@ class LLDrawPoolWater: public LLFacePool
 protected:
 	LLPointer<LLViewerTexture> mHBTex[2];
 	LLPointer<LLViewerTexture> mWaterImagep;
+	LLPointer<LLViewerTexture> mOpaqueWaterImagep;
 	LLPointer<LLViewerTexture> mWaterNormp;
 
 public:
@@ -81,6 +82,9 @@ public:
 
 	void renderReflection(LLFace* face);
 	void shade();
+
+protected:
+	void renderOpaqueLegacyWater();
 };
 
 void cgErrorCallback();
-- 
cgit v1.2.3