diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-07-07 19:31:34 +0100 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-07-07 19:31:34 +0100 |
| commit | 4c1d47d4ae231c1141c6ecf707c033563c99382a (patch) | |
| tree | 4560a3495c21f70e5edb6210baf887d873ef2c01 /indra/newview/lleventpoll.cpp | |
| parent | 50a97cd15a4c290bd26729f2c8a498bb1d0178d8 (diff) | |
Backed out selfless merge
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 0aad1d5ba9..54da226209 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()); - llcoro::waitForEventOn(timeout); + waitForEventOn(timeout); if (mDone) break; |