diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-27 14:48:39 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-27 14:48:39 -0500 |
commit | 063edac43f90d2cb0d2b41db939bbf919a1a3217 (patch) | |
tree | bbf1d446baef80933f6be80d05734d68144ae4cc /indra/newview/lltexturefetch.h | |
parent | 6f53796ccf4dc29368920a322baeaceb3fd2266f (diff) | |
parent | e7ab3da7a7f5c68e3544a64c30f011762572995a (diff) |
Automated merge with file:///Users/nat/linden/viewer-leap-daggy
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. |