From e61a10ec5b6b84fcb5c27e8e308022d0094f8736 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Mon, 4 Jun 2007 18:46:59 +0000
Subject: svn merge -r 62602:62831
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/llaudio/llaudiodecodemgr.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/llaudio')

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;
-- 
cgit v1.2.3