diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-04-26 11:56:25 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-04-26 11:56:25 -0700 |
| commit | dd2311b993d137c538ca57b4360669db6d7fbfa0 (patch) | |
| tree | e7b3553da33dedfd436192e6ae555d884e58ce16 /indra/llcommon/lleventcoro.h | |
| parent | 4d9dd3271b1a015d9afd21767e579a4cd71982ed (diff) | |
MAINT-6336: Put the timeout upstream of the suspending pump and fire the timeout it. Also some cleanup on LLSD construction in vivox.
Diffstat (limited to 'indra/llcommon/lleventcoro.h')
| -rwxr-xr-x | indra/llcommon/lleventcoro.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/lleventcoro.h b/indra/llcommon/lleventcoro.h index 19c68e1f35..87926c692d 100755 --- a/indra/llcommon/lleventcoro.h +++ b/indra/llcommon/lleventcoro.h @@ -147,7 +147,10 @@ LLSD suspendUntilEventOn(const LLEventPumpOrPumpName& pump) return postAndSuspend(LLSD(), LLEventPumpOrPumpName(), pump); } -LLSD suspendUntilEventOnWithTimeout(const LLEventPumpOrPumpName& pump, F32 timeoutin, const LLSD &timeoutResult); +/// Suspend the coroutine until an event is fired on the identified pump +/// or the timeout duration has elapsed. If the timeout duration +/// elapses the specified LLSD is returned. +LLSD suspendUntilEventOnWithTimeout(const LLEventPumpOrPumpName& suspendPumpOrName, F32 timeoutin, const LLSD &timeoutResult); } // namespace llcoro |