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/llimage/llimageworker.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/llimage/llimageworker.cpp')

diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp
index 297482a222..1e625fbe28 100644
--- a/indra/llimage/llimageworker.cpp
+++ b/indra/llimage/llimageworker.cpp
@@ -30,7 +30,9 @@ void LLImageWorker::cleanupClass()
 
 //----------------------------------------------------------------------------
 
-LLImageWorker::LLImageWorker(LLImageFormatted* image, U32 priority, S32 discard, LLResponder* responder)
+LLImageWorker::LLImageWorker(LLImageFormatted* image, U32 priority,
+							 S32 discard,
+							 LLPointer<LLResponder> responder)
 	: LLWorkerClass(sWorkerThread, "Image"),
 	  mFormattedImage(image),
 	  mDecodedType(-1),
-- 
cgit v1.3