diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-05-06 09:05:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-05-06 09:05:51 -0400 |
| commit | a07a8cbf6eca73272f2c774df7122a1f0c5e1aa9 (patch) | |
| tree | f716bdae5a265aabf8f9da1413df6a19fe3ada52 /indra/llcommon/lleventcoro.h | |
| parent | c938e165062cbe53065dcdaa434fc1c3d9f38774 (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
merge changes for 4.0.4-release
Diffstat (limited to 'indra/llcommon/lleventcoro.h')
| -rwxr-xr-x | indra/llcommon/lleventcoro.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/lleventcoro.h b/indra/llcommon/lleventcoro.h index 2105faf861..87926c692d 100755 --- a/indra/llcommon/lleventcoro.h +++ b/indra/llcommon/lleventcoro.h @@ -147,6 +147,11 @@ LLSD suspendUntilEventOn(const LLEventPumpOrPumpName& pump) return postAndSuspend(LLSD(), LLEventPumpOrPumpName(), pump); } +/// 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 /// return type for two-pump variant of suspendUntilEventOn() |