diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-13 09:58:47 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-13 09:58:47 -0500 |
| commit | f6b8bfd3da163d275400035b24a969e5147c6352 (patch) | |
| tree | 449fda9ad8f4628e0b1dfac31068a9a5d943a7af /indra/llimage/llimageworker.cpp | |
| parent | 6aa48f31c9af1f46335aa64648cda77912aa391d (diff) | |
| parent | 4405910caa34446a19f66cfc35a9270a0e14292f (diff) | |
merge changes for vmrg-215
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(); |