diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-01-23 19:43:14 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-01-23 19:43:14 +0100 |
| commit | 7b3bc9b58702940c039db620642c005e054040ed (patch) | |
| tree | f8be20d7d49f7538e3f4daf4564410768c7007b7 /indra/newview/lltexturefetch.cpp | |
| parent | b81bf4f6f182e6345889d70140b34b15cbfb8d27 (diff) | |
| parent | 64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 56dfb61c4f..f18aa8b4e6 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -2204,7 +2204,7 @@ void LLTextureFetch::commonUpdate() // MAIN THREAD //virtual -S32 LLTextureFetch::update(U32 max_time_ms) +S32 LLTextureFetch::update(F32 max_time_ms) { static LLCachedControl<F32> band_width(gSavedSettings,"ThrottleBandwidthKBPS"); |