diff options
| author | Richard Linden <none@none> | 2013-11-06 17:22:04 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-11-06 17:22:04 -0800 |
| commit | fe518bde8e6db65d3d6b178c200410b1346639a4 (patch) | |
| tree | d738e12f8391a675d36aae9d59ced8104846008c /indra/llcommon/llleap.cpp | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
| parent | d9d46d908c0573dbcd45ec2a1bea56966823343b (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); |