diff options
| author | Richard Linden <none@none> | 2012-01-18 13:36:16 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-18 13:36:16 -0800 |
| commit | a1b200878fdc517252506a19f71432ab956086c2 (patch) | |
| tree | 627d180f48cc8dca01f9144da39b2fa6fbd84979 /indra/newview/lltexturefetch.cpp | |
| parent | 41a43a4125a69835e6a76f5792a267ba0797f41a (diff) | |
| parent | b1d28300fbd37edfb4093b13ea0d243e45d6952b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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"); |