diff options
| author | Richard Linden <none@none> | 2012-12-07 15:20:12 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-12-07 15:20:12 -0800 |
| commit | c99886d94389babc78e92bbfa5084fdd785915af (patch) | |
| tree | 839ffe3031ca296182743cf7af4d7375e2fb3c78 /indra/llcommon/llleap.cpp | |
| parent | 3745d1254acc386acaadd20016123c9a47b8d10c (diff) | |
SH-3406 WIP convert fast timers to lltrace system
improved unit tests for LLUnit
renamed LLUnit to LLUnitImplicit with LLUnit being reserved for
explicit units
Diffstat (limited to 'indra/llcommon/llleap.cpp')
| -rw-r--r-- | indra/llcommon/llleap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp index 0a57ef1c48..84d2a12f65 100644 --- a/indra/llcommon/llleap.cpp +++ b/indra/llcommon/llleap.cpp @@ -394,7 +394,7 @@ public: LLProcess::WritePipe& childin(mChild->getWritePipe(LLProcess::STDIN)); LLEventPump& mainloop(LLEventPumps::instance().obtain("mainloop")); LLSD nop; - F64 until(LLTimer::getElapsedSeconds() + 2); + F64 until = (LLTimer::getElapsedSeconds() + 2).value(); while (childin.size() && LLTimer::getElapsedSeconds() < until) { mainloop.post(nop); |