diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-01-18 14:24:58 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-01-18 14:24:58 -0800 |
| commit | 6ee627d4c065f3c5aedba4765823a65255679f09 (patch) | |
| tree | 90c43334f5966e792cd9b9438ba2beb60623c43d /indra/newview/lltexturefetch.cpp | |
| parent | 07294e04983c6c24ec8cd5d589c4a0a8fda87431 (diff) | |
| parent | a1b200878fdc517252506a19f71432ab956086c2 (diff) | |
Pull from 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"); |