diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-01-23 19:43:14 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-01-23 19:43:14 +0100 |
| commit | 7b3bc9b58702940c039db620642c005e054040ed (patch) | |
| tree | f8be20d7d49f7538e3f4daf4564410768c7007b7 /indra/llimage/llimageworker.cpp | |
| parent | b81bf4f6f182e6345889d70140b34b15cbfb8d27 (diff) | |
| parent | 64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff) | |
Merge with viewer-development
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(); |