diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-02 14:26:33 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-02 14:26:33 -0500 |
| commit | 5b2dbbadf70ee33bfd288b6384ae0d51715488b1 (patch) | |
| tree | 48d7678fbbca7359db17b472e3233c1d2874828b /indra/newview/lltexturefetch.cpp | |
| parent | 03290257345c22f909cf1cfac3981e7e07820d21 (diff) | |
| parent | 34408bed2644ff957502454f05c21c31fec90009 (diff) | |
merge changes for latest 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 be2c23ec8b..290bdd057e 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -2205,7 +2205,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"); |