diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-12-02 21:34:01 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-12-02 21:34:01 -0600 |
| commit | 98802a1ef99b7e5fb586dc259118fd58dc34631a (patch) | |
| tree | 51e183db55f7c3dfbc60bcc4ab09e700d8f7f51a /indra/newview/lldrawpoolwater.h | |
| parent | 0be7fcf2a95a6d885bbef583966757d12fc9d18c (diff) | |
| parent | 680328dd78e1d31a2f8836919a0f6140a76af5f4 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lldrawpoolwater.h')
| -rw-r--r-- | indra/newview/lldrawpoolwater.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index 3ab4bc5e2c..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: @@ -74,13 +75,15 @@ 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 void renderReflection(LLFace* face); void shade(); + +protected: + void renderOpaqueLegacyWater(); }; void cgErrorCallback(); |