diff options
| author | prep <prep@lindenlab.com> | 2012-01-19 14:39:06 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-01-19 14:39:06 -0500 |
| commit | dc6b871db8e5e5247d8ef88150efb18186b5e6c8 (patch) | |
| tree | 65a14a4731b74a8c22c11142b46ecb1a48a448b5 /indra/newview/lltexturecache.cpp | |
| parent | e2ef5a5edce6a01724d91fde5b471b0bae18d045 (diff) | |
| parent | 146f0c25504cc16458cb20312eba63b04d26389d (diff) | |
merge
Diffstat (limited to 'indra/newview/lltexturecache.cpp')
| -rw-r--r-- | indra/newview/lltexturecache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index e7a176f4f9..8632890bbb 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -760,7 +760,7 @@ LLTextureCache::~LLTextureCache() ////////////////////////////////////////////////////////////////////////////// //virtual -S32 LLTextureCache::update(U32 max_time_ms) +S32 LLTextureCache::update(F32 max_time_ms) { static LLFrameTimer timer ; static const F32 MAX_TIME_INTERVAL = 300.f ; //seconds. |