diff options
| author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-27 09:04:27 -0400 |
|---|---|---|
| committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-27 09:04:27 -0400 |
| commit | ce34ba1b89a105e5f2f4902b2aebb486d16711e9 (patch) | |
| tree | 373b68976de2a260506615c6a1aa5380ffe15b22 /indra/newview/llvowater.h | |
| parent | 8bef9cc8137dc58b818c60dd1173959fcab40bd8 (diff) | |
| parent | 8947724baa6d595844daeee2f18c865d1886acc5 (diff) | |
Merge from viewer-development
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 beefc3f17f..cb9584cabf 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 |