diff options
| author | Richard Linden <none@none> | 2013-08-23 15:35:45 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-23 15:35:45 -0700 |
| commit | e30b03198cf35496e691e601ef3167ca44229116 (patch) | |
| tree | 8a3b076db5081fcf9fa3d298e24a37f35426c60c /indra/newview | |
| parent | 4c7f4896290707c833f5e088963c94ff5e01acde (diff) | |
| parent | b667d20e00e4ea5f1d5a619d2868b502583deb43 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index f506765da3..0f155b8ad7 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1463,7 +1463,7 @@ bool LLAppViewer::mainLoop() ms_sleep(500); } - const F64 max_idle_time = llmin(.005f*10.f*(F32MillisecondsImplicit)gFrameTimeSeconds, F32MillisecondsImplicit(5)); // 5 ms a second + const F64Milliseconds max_idle_time = llmin(.005f*10.f*(F32Milliseconds)gFrameTimeSeconds, F32Milliseconds(5)); // 5 ms a second idleTimer.reset(); S32 total_work_pending = 0; S32 total_io_pending = 0; |