From e61a10ec5b6b84fcb5c27e8e308022d0094f8736 Mon Sep 17 00:00:00 2001 From: Josh Bell 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 +++- indra/llimage/llimageworker.h | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/llimage') 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 responder) : LLWorkerClass(sWorkerThread, "Image"), mFormattedImage(image), mDecodedType(-1), diff --git a/indra/llimage/llimageworker.h b/indra/llimage/llimageworker.h index 6e9ecacc89..763936d772 100644 --- a/indra/llimage/llimageworker.h +++ b/indra/llimage/llimageworker.h @@ -21,7 +21,8 @@ public: // LLWorkerThread public: - LLImageWorker(LLImageFormatted* image, U32 priority, S32 discard, LLResponder* responder = NULL); + LLImageWorker(LLImageFormatted* image, U32 priority, S32 discard, + LLPointer responder); ~LLImageWorker(); // called from WORKER THREAD, returns TRUE if done -- cgit v1.2.3