diff options
| author | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
| commit | 98aabdc176c23de9ba23f902dc2015f9c775d26e (patch) | |
| tree | 5ac6ffdb8e9be8d3c2a2f8b591c9971726c6b73c /indra/llcommon/llleap.cpp | |
| parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
| parent | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (diff) | |
merge with release
Diffstat (limited to 'indra/llcommon/llleap.cpp')
| -rwxr-xr-x | 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 100755 --- 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); |