diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-01-18 14:24:58 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-01-18 14:24:58 -0800 |
| commit | 6ee627d4c065f3c5aedba4765823a65255679f09 (patch) | |
| tree | 90c43334f5966e792cd9b9438ba2beb60623c43d /indra/newview/lltexturefetch.h | |
| parent | 07294e04983c6c24ec8cd5d589c4a0a8fda87431 (diff) | |
| parent | a1b200878fdc517252506a19f71432ab956086c2 (diff) | |
Pull from viewer-experience
Diffstat (limited to 'indra/newview/lltexturefetch.h')
| -rw-r--r-- | indra/newview/lltexturefetch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h index d101da1f4b..35df7d816f 100644 --- a/indra/newview/lltexturefetch.h +++ b/indra/newview/lltexturefetch.h @@ -55,7 +55,7 @@ public: class TFRequest; - /*virtual*/ S32 update(U32 max_time_ms); + /*virtual*/ S32 update(F32 max_time_ms); void shutDownTextureCacheThread() ; //called in the main thread after the TextureCacheThread shuts down. void shutDownImageDecodeThread() ; //called in the main thread after the ImageDecodeThread shuts down. |