diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:37:28 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:37:28 -0500 |
| commit | 0915ce7834f8e36c53e0790c2946b952a12a74c6 (patch) | |
| tree | 270a7d6d12e444d739b85ad9d89e0001621b20a2 /indra/llimage/llimageworker.cpp | |
| parent | 613d0fe42ff94064a7fabeff28845a9406ea9b9c (diff) | |
| parent | 6157386b4c96740e406a49eb9e8f42c6d7f252ff (diff) | |
reconciled .hgtags
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(); |