diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-12-05 17:56:38 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-12-05 17:56:38 -0600 |
| commit | 1516e4c4971152273dc4f1055eaaae117419a8f6 (patch) | |
| tree | c7c2c9265897974e80aca2cfb56319cb9f744515 /indra/llimage/llimageworker.cpp | |
| parent | 66c72be939012ddacdf0831f380e758569172b15 (diff) | |
| parent | 78233d1bf9930575ee7250257ac68603f41f568a (diff) | |
merge
Diffstat (limited to 'indra/llimage/llimageworker.cpp')
| -rw-r--r-- | indra/llimage/llimageworker.cpp | 2 |
1 files changed, 1 insertions, 1 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(); |