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/llvotextbubble.h | |
parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/newview/llvotextbubble.h')
-rw-r--r-- | indra/newview/llvotextbubble.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llvotextbubble.h b/indra/newview/llvotextbubble.h index 9fe6386a3b..a348a53c7c 100644 --- a/indra/newview/llvotextbubble.h +++ b/indra/newview/llvotextbubble.h @@ -12,7 +12,7 @@ #include "llviewerobject.h" #include "llframetimer.h" -class LLVOTextBubble : public LLViewerObject +class LLVOTextBubble : public LLAlphaObject { public: LLVOTextBubble(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); @@ -25,6 +25,16 @@ public: /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline); /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); /*virtual*/ BOOL updateLOD(); + /*virtual*/ void updateFaceSize(S32 idx); + + /*virtual*/ void getGeometry(S32 idx, + LLStrider<LLVector3>& verticesp, + LLStrider<LLVector3>& normalsp, + LLStrider<LLVector2>& texcoordsp, + LLStrider<LLColor4U>& colorsp, + LLStrider<U32>& indicesp); + + virtual U32 getPartitionType() const; LLColor4 mColor; S32 mLOD; |