diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-30 22:57:05 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-30 22:57:05 -0700 |
| commit | c7b6ebaf762ba9bcdf64c6bc3b1e0fb81356c5b2 (patch) | |
| tree | 2a17359f6416b0f5c8f0d9632b390eef348a056b /indra/newview/llvowater.h | |
| parent | df67c34b42837a782ee76f71d1a63fe93ea0ec08 (diff) | |
Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low altitude flicker though (STORM-306)
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 |