diff options
| author | prep <prep@lindenlab.com> | 2010-10-28 13:54:43 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2010-10-28 13:54:43 -0400 |
| commit | a91bff4036bbdd0f32722ed573f9f44ab00f00f0 (patch) | |
| tree | a2ee17189b530ace49c886d8a8acc4deb32620b5 /indra/newview/llvowater.h | |
| parent | 53d5fd1e9bb59868b793f9bef0529cd62ca70126 (diff) | |
| parent | 32bcdd11990e1fa5126a15a2bd22249162c0806a (diff) | |
merge
Diffstat (limited to 'indra/newview/llvowater.h')
| -rw-r--r-- | indra/newview/llvowater.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llvowater.h b/indra/newview/llvowater.h index 07f653ae63..ed709dd840 100644 --- a/indra/newview/llvowater.h +++ b/indra/newview/llvowater.h @@ -29,6 +29,7 @@ #include "llviewerobject.h" #include "llviewertexture.h" +#include "pipeline.h" #include "v2math.h" const U32 N_RES = 16; //32 // number of subdivisions of wave tile @@ -77,6 +78,19 @@ public: protected: BOOL mUseTexture; BOOL mIsEdgePatch; + S32 mRenderType; }; +class LLVOVoidWater : public LLVOWater +{ +public: + LLVOVoidWater(LLUUID const& id, LLPCode pcode, LLViewerRegion* regionp) : LLVOWater(id, pcode, regionp) + { + mRenderType = LLPipeline::RENDER_TYPE_VOIDWATER; + } + + /*virtual*/ U32 getPartitionType() const; +}; + + #endif // LL_VOSURFACEPATCH_H |