summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-07 17:25:06 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-07 17:25:06 -0500
commit8a51346d6f0d9171263124c203b2194db914b47d (patch)
treee3c03925421e8d758d567cec73e82a759d28aa86 /indra/newview/lltexturefetch.h
parent50ed3bde4392d5df71d2bc53ddbd8f3a138e40ea (diff)
parent04bee016c8f33ff98b40c2b3d237f5ded1453284 (diff)
merge
Diffstat (limited to 'indra/newview/lltexturefetch.h')
-rw-r--r--indra/newview/lltexturefetch.h2
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.