diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-12-07 17:25:06 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-12-07 17:25:06 -0500 |
commit | 8a51346d6f0d9171263124c203b2194db914b47d (patch) | |
tree | e3c03925421e8d758d567cec73e82a759d28aa86 /indra/newview/lltexturefetch.cpp | |
parent | 50ed3bde4392d5df71d2bc53ddbd8f3a138e40ea (diff) | |
parent | 04bee016c8f33ff98b40c2b3d237f5ded1453284 (diff) |
merge
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"); |