diff options
| author | Richard Linden <none@none> | 2012-01-17 12:05:23 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-17 12:05:23 -0800 |
| commit | 37593f276cacb9db7f1f8ed8ff6c1fe1b56ff883 (patch) | |
| tree | 2ec32a4cf984cde8a003f45b324de328f318c675 /indra/newview/lltexturecache.cpp | |
| parent | 944814941d16e7853ff365acc17a16b3a20ac9cb (diff) | |
| parent | facb0fa42cf7dbc4deb3a4026cc216aa0099111e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
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. |