V2 llimage merge

2011-02-22 18:21:02 -06:00
parent 97d5e8f154
commit a207a71066
5 changed files with 30 additions and 20 deletions
--- a/indra/llimage/llimageworker.h
+++ b/indra/llimage/llimageworker.h
@@ -78,6 +78,8 @@ public:
 	
 public:
 	LLImageDecodeThread(bool threaded = true);
+	virtual ~LLImageDecodeThread();
+
 	handle_t decodeImage(LLImageFormatted* image,
 						 U32 priority, S32 discard, BOOL needs_aux,
 						 Responder* responder);
@@ -90,7 +92,7 @@ private:
 	struct creation_info
 	{
 		handle_t handle;
-		LLImageFormatted* image;
+		LLPointer<LLImageFormatted> image;
 		U32 priority;
 		S32 discard;
 		BOOL needs_aux;