diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
| commit | e61a10ec5b6b84fcb5c27e8e308022d0094f8736 (patch) | |
| tree | bcf6152629edb1b2548af039bd89b6b573e1e514 /indra/newview/llvotextbubble.h | |
| parent | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (diff) | |
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llvotextbubble.h')
| -rw-r--r-- | indra/newview/llvotextbubble.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvotextbubble.h b/indra/newview/llvotextbubble.h index a348a53c7c..bba51babd3 100644 --- a/indra/newview/llvotextbubble.h +++ b/indra/newview/llvotextbubble.h @@ -16,7 +16,6 @@ class LLVOTextBubble : public LLAlphaObject { public: LLVOTextBubble(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); - virtual ~LLVOTextBubble(); /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate. /*virtual*/ BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); @@ -39,7 +38,9 @@ public: LLColor4 mColor; S32 mLOD; BOOL mVolumeChanged; + protected: + ~LLVOTextBubble(); BOOL setVolume(const LLVolumeParams &volume_params); LLFrameTimer mUpdateTimer; }; |