diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-12-07 17:25:06 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-12-07 17:25:06 -0500 |
| commit | 8a51346d6f0d9171263124c203b2194db914b47d (patch) | |
| tree | e3c03925421e8d758d567cec73e82a759d28aa86 /indra/llimage/llimageworker.cpp | |
| parent | 50ed3bde4392d5df71d2bc53ddbd8f3a138e40ea (diff) | |
| parent | 04bee016c8f33ff98b40c2b3d237f5ded1453284 (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(); |