diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-04 19:58:43 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-04 19:58:43 -0400 |
| commit | 50a97cd15a4c290bd26729f2c8a498bb1d0178d8 (patch) | |
| tree | 247365c2de7ccd0bc70a39b6a70112ac881988c5 /indra/newview | |
| parent | 99aa00293b1d79eb47cfe2caa85a5740a2959297 (diff) | |
| parent | 1d2514956f15f780aaead9bc123c1353a5b7fd20 (diff) | |
Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llcoproceduremanager.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/lleventpoll.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llcoproceduremanager.cpp b/indra/newview/llcoproceduremanager.cpp index 1a4a906f35..d3168985f8 100644 --- a/indra/newview/llcoproceduremanager.cpp +++ b/indra/newview/llcoproceduremanager.cpp @@ -138,7 +138,7 @@ void LLCoprocedureManager::coprocedureInvokerCoro(LLCoreHttpUtil::HttpCoroutineA while (!mShutdown) { - waitForEventOn(mWakeupTrigger); + llcoro::waitForEventOn(mWakeupTrigger); if (mShutdown) break; 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; |