diff options
| author | Richard Linden <none@none> | 2012-01-17 12:05:23 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-17 12:05:23 -0800 |
| commit | 37593f276cacb9db7f1f8ed8ff6c1fe1b56ff883 (patch) | |
| tree | 2ec32a4cf984cde8a003f45b324de328f318c675 /indra/llimage | |
| parent | 944814941d16e7853ff365acc17a16b3a20ac9cb (diff) | |
| parent | facb0fa42cf7dbc4deb3a4026cc216aa0099111e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimageworker.cpp | 2 | ||||
| -rw-r--r-- | indra/llimage/llimageworker.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp index 28dc3bd313..ad2eb0f69c 100644 --- a/indra/llimage/llimageworker.cpp +++ b/indra/llimage/llimageworker.cpp @@ -46,7 +46,7 @@ LLImageDecodeThread::~LLImageDecodeThread() // MAIN THREAD // virtual -S32 LLImageDecodeThread::update(U32 max_time_ms) +S32 LLImageDecodeThread::update(F32 max_time_ms) { LLMutexLock lock(mCreationMutex); for (creation_list_t::iterator iter = mCreationList.begin(); diff --git a/indra/llimage/llimageworker.h b/indra/llimage/llimageworker.h index c684222fa5..1bfb0ddfd3 100644 --- a/indra/llimage/llimageworker.h +++ b/indra/llimage/llimageworker.h @@ -78,7 +78,7 @@ public: handle_t decodeImage(LLImageFormatted* image, U32 priority, S32 discard, BOOL needs_aux, Responder* responder); - S32 update(U32 max_time_ms); + S32 update(F32 max_time_ms); // Used by unit tests to check the consistency of the thread instance S32 tut_size(); |