diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
| commit | 4dabd9c0472deb49573fdafef2fa413e59703f19 (patch) | |
| tree | 06c680d6a2047e03838d6548bccd26c7baf9d652 /indra/newview/lldrawpooltree.h | |
| parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) | |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/newview/lldrawpooltree.h')
| -rw-r--r-- | indra/newview/lldrawpooltree.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/lldrawpooltree.h b/indra/newview/lldrawpooltree.h index 228b11a981..5b937cf688 100644 --- a/indra/newview/lldrawpooltree.h +++ b/indra/newview/lldrawpooltree.h @@ -11,10 +11,19 @@ #include "lldrawpool.h" -class LLDrawPoolTree : public LLDrawPool +class LLDrawPoolTree : public LLFacePool { LLPointer<LLViewerImage> mTexturep; public: + enum + { + VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | + LLVertexBuffer::MAP_NORMAL | + LLVertexBuffer::MAP_TEXCOORD + }; + + virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; } + LLDrawPoolTree(LLViewerImage *texturep); /*virtual*/ LLDrawPool *instancePool(); @@ -24,7 +33,6 @@ public: /*virtual*/ void render(S32 pass = 0); /*virtual*/ void endRenderPass( S32 pass ); /*virtual*/ void renderForSelect(); - /*virtual*/ S32 rebuild(); /*virtual*/ BOOL verify() const; /*virtual*/ LLViewerImage *getTexture(); /*virtual*/ LLViewerImage *getDebugTexture(); |