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.h | |
| parent | 6aa48f31c9af1f46335aa64648cda77912aa391d (diff) | |
| parent | 4405910caa34446a19f66cfc35a9270a0e14292f (diff) | |
merge changes for vmrg-215
Diffstat (limited to 'indra/llimage/llimageworker.h')
| -rw-r--r-- | indra/llimage/llimageworker.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimageworker.h b/indra/llimage/llimageworker.h index c684222fa5..1bfb0ddfd3 100644 --- a/indra/llimage/llimageworker.h +++ b/indra/llimage/llimageworker.h @@ -78,7 +78,7 @@ public: handle_t decodeImage(LLImageFormatted* image, U32 priority, S32 discard, BOOL needs_aux, Responder* responder); - S32 update(U32 max_time_ms); + S32 update(F32 max_time_ms); // Used by unit tests to check the consistency of the thread instance S32 tut_size(); |