diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-07 13:11:39 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-07 13:11:39 -0500 |
| commit | 3bcd4f4608a7ce33b61c6978544096436dea4e53 (patch) | |
| tree | 6ef7168a6ec646c023d2f4badc9a0960d20eea3e /indra/newview/lltexturecache.cpp | |
| parent | 33a42b32ca72031a79edca821966f6ebbdcddc93 (diff) | |
| parent | 5e367f0d9de593c45683f7c640024a378bb03919 (diff) | |
Merge daggy fix at r32811ea374ab to tip
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. |