diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-11 08:06:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-11 08:06:15 -0400 |
| commit | f1be78f7e235bfe9395eed748154d77763d5ea65 (patch) | |
| tree | 878191a30d4b72db659977be8d4fd63086126aac /indra/newview/lleventpoll.cpp | |
| parent | d215de3b7d672dcb5da41600c2b5d0abe2cb82ce (diff) | |
MAINT-5351: Finish messy merge restoring 'selfless' changes.
Diffstat (limited to 'indra/newview/lleventpoll.cpp')
| -rwxr-xr-x | indra/newview/lleventpoll.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp index 54da226209..0aad1d5ba9 100755 --- a/indra/newview/lleventpoll.cpp +++ b/indra/newview/lleventpoll.cpp @@ -197,7 +197,7 @@ namespace Details " seconds, error count is now " << errorCount << LL_ENDL; timeout.eventAfter(waitToRetry, LLSD()); - waitForEventOn(timeout); + llcoro::waitForEventOn(timeout); if (mDone) break; |