summaryrefslogtreecommitdiff
path: root/indra/llimage/llimageworker.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llimage/llimageworker.h')
-rw-r--r--indra/llimage/llimageworker.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/indra/llimage/llimageworker.h b/indra/llimage/llimageworker.h
index 1bfb0ddfd3..e0a94d2841 100644
--- a/indra/llimage/llimageworker.h
+++ b/indra/llimage/llimageworker.h
@@ -49,7 +49,7 @@ public:
public:
ImageRequest(handle_t handle, LLImageFormatted* image,
- U32 priority, S32 discard, BOOL needs_aux,
+ S32 discard, BOOL needs_aux,
LLImageDecodeThread::Responder* responder);
/*virtual*/ bool processRequest();
@@ -76,28 +76,22 @@ public:
virtual ~LLImageDecodeThread();
handle_t decodeImage(LLImageFormatted* image,
- U32 priority, S32 discard, BOOL needs_aux,
+ S32 discard, BOOL needs_aux,
Responder* responder);
S32 update(F32 max_time_ms);
- // Used by unit tests to check the consistency of the thread instance
- S32 tut_size();
-
private:
struct creation_info
{
handle_t handle;
LLPointer<LLImageFormatted> image;
- U32 priority;
S32 discard;
BOOL needs_aux;
LLPointer<Responder> responder;
creation_info(handle_t h, LLImageFormatted* i, U32 p, S32 d, BOOL aux, Responder* r)
- : handle(h), image(i), priority(p), discard(d), needs_aux(aux), responder(r)
+ : handle(h), image(i), discard(d), needs_aux(aux), responder(r)
{}
};
- typedef std::list<creation_info> creation_list_t;
- creation_list_t mCreationList;
LLMutex* mCreationMutex;
};