From f1be78f7e235bfe9395eed748154d77763d5ea65 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Sat, 11 Jul 2015 08:06:15 -0400
Subject: MAINT-5351: Finish messy merge restoring 'selfless' changes.

---
 indra/newview/lleventpoll.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/lleventpoll.cpp')

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;
-- 
cgit v1.3