aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llimage
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:58 -0500
committerJacek Antonelli2008-08-15 23:44:58 -0500
commit089fc07d207c71ce1401e72f09c31ad8c45872e2 (patch)
tree0028955add042c6f45b47a7b774adeeac9c592cb /linden/indra/llimage
parentSecond Life viewer sources 1.16.0.5 (diff)
downloadmeta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.zip
meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.gz
meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.bz2
meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.xz
Second Life viewer sources 1.17.0.12
Diffstat (limited to 'linden/indra/llimage')
-rw-r--r--linden/indra/llimage/llimageworker.cpp4
-rw-r--r--linden/indra/llimage/llimageworker.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/llimage/llimageworker.cpp b/linden/indra/llimage/llimageworker.cpp
index c28f80c..c59eac2 100644
--- a/linden/indra/llimage/llimageworker.cpp
+++ b/linden/indra/llimage/llimageworker.cpp
@@ -50,7 +50,9 @@ void LLImageWorker::cleanupClass()
50 50
51//---------------------------------------------------------------------------- 51//----------------------------------------------------------------------------
52 52
53LLImageWorker::LLImageWorker(LLImageFormatted* image, U32 priority, S32 discard, LLResponder* responder) 53LLImageWorker::LLImageWorker(LLImageFormatted* image, U32 priority,
54 S32 discard,
55 LLPointer<LLResponder> responder)
54 : LLWorkerClass(sWorkerThread, "Image"), 56 : LLWorkerClass(sWorkerThread, "Image"),
55 mFormattedImage(image), 57 mFormattedImage(image),
56 mDecodedType(-1), 58 mDecodedType(-1),
diff --git a/linden/indra/llimage/llimageworker.h b/linden/indra/llimage/llimageworker.h
index 8026cbb..a84918d 100644
--- a/linden/indra/llimage/llimageworker.h
+++ b/linden/indra/llimage/llimageworker.h
@@ -41,7 +41,8 @@ public:
41 41
42 // LLWorkerThread 42 // LLWorkerThread
43public: 43public:
44 LLImageWorker(LLImageFormatted* image, U32 priority, S32 discard, LLResponder* responder = NULL); 44 LLImageWorker(LLImageFormatted* image, U32 priority, S32 discard,
45 LLPointer<LLResponder> responder);
45 ~LLImageWorker(); 46 ~LLImageWorker();
46 47
47 // called from WORKER THREAD, returns TRUE if done 48 // called from WORKER THREAD, returns TRUE if done