diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-11-18 13:23:01 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-11-18 13:23:01 -0500 |
| commit | 61daa3133a7c4f62d1d9654719d7080020b6cc7a (patch) | |
| tree | 69e615cce969934047c9beee753b35d212f45de1 /indra/newview/lldrawpoolwater.h | |
| parent | d76e0dd87f64258ade944323eb5cb6063bca7444 (diff) | |
| parent | 80364035a10ad28473002d80e575e14e041ac089 (diff) | |
automated merge from viewer-development-shining
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(); |