diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:51:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:51:12 -0500 |
| commit | 1630bd4149cc8637f01eea82e4497dbf0d76b777 (patch) | |
| tree | 6c06b7a5a33217d23e752e9336f024e082aeecee /indra/newview/lldrawpoolwater.h | |
| parent | f0a0831954475a2f49fe7473046f0ba657fb2405 (diff) | |
| parent | bf5e9b8374c905b795339ca6426034e237ed5378 (diff) | |
merge fix for STORM-560
Diffstat (limited to 'indra/newview/lldrawpoolwater.h')
| -rw-r--r-- | indra/newview/lldrawpoolwater.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index 2648a5276c..99b541ca5a 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: @@ -80,6 +81,9 @@ public: void renderReflection(LLFace* face); void shade(); + +protected: + void renderOpaqueLegacyWater(); }; void cgErrorCallback(); |