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/llaudio | |
parent | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (diff) |
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/llaudio')
-rw-r--r-- | indra/llaudio/llaudiodecodemgr.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index 348175675e..1b4c952e8e 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -53,7 +53,6 @@ public: }; LLVorbisDecodeState(const LLUUID &uuid, const LLString &out_filename); - virtual ~LLVorbisDecodeState(); BOOL initDecode(); BOOL decodeSection(); // Return TRUE if done. @@ -65,7 +64,10 @@ public: BOOL isValid() const { return mValid; } BOOL isDone() const { return mDone; } const LLUUID &getUUID() const { return mUUID; } + protected: + virtual ~LLVorbisDecodeState(); + BOOL mValid; BOOL mDone; LLAtomicS32 mBytesRead; |