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/llimage | |
| parent | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (diff) | |
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimageworker.cpp | 4 | ||||
| -rw-r--r-- | indra/llimage/llimageworker.h | 3 |
2 files changed, 5 insertions, 2 deletions
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), 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<LLResponder> responder); ~LLImageWorker(); // called from WORKER THREAD, returns TRUE if done |