summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturecache.h
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-01-17 10:19:27 -0800
committerTodd Stinson <stinson@lindenlab.com>2012-01-17 10:19:27 -0800
commit8cf6b9cb929ff37fc6febe1f4ede4efa526260d9 (patch)
treefb81fc741a515279a4602c1b64abcc7d443cf947 /indra/newview/lltexturecache.h
parentfa03d3ee3d9bcf213754250a8180a65156bffe8d (diff)
parent64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/lltexturecache.h')
-rw-r--r--indra/newview/lltexturecache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h
index 64e3a2658c..dd0cc9b4bd 100644
--- a/indra/newview/lltexturecache.h
+++ b/indra/newview/lltexturecache.h
@@ -101,7 +101,7 @@ public:
LLTextureCache(bool threaded);
~LLTextureCache();
- /*virtual*/ S32 update(U32 max_time_ms);
+ /*virtual*/ S32 update(F32 max_time_ms);
void purgeCache(ELLPath location);
void setReadOnly(BOOL read_only) ;