diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-04-22 14:52:36 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-04-22 14:52:36 -0700 |
| commit | fd8b7a393446a0d3cde2b35dfb0c742f56210a5e (patch) | |
| tree | 762390b248ce4421f0b14d6c98443eb1a2dc00dc /indra/llcommon/lleventcoro.h | |
| parent | d6f454831fd1386a5e84713b06820e8bdc176e4f (diff) | |
| parent | 899489ae0a4bc4eb187e7813e338b937384a1866 (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/lleventcoro.h')
| -rwxr-xr-x | indra/llcommon/lleventcoro.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/lleventcoro.h b/indra/llcommon/lleventcoro.h index 2105faf861..19c68e1f35 100755 --- a/indra/llcommon/lleventcoro.h +++ b/indra/llcommon/lleventcoro.h @@ -147,6 +147,8 @@ LLSD suspendUntilEventOn(const LLEventPumpOrPumpName& pump) return postAndSuspend(LLSD(), LLEventPumpOrPumpName(), pump); } +LLSD suspendUntilEventOnWithTimeout(const LLEventPumpOrPumpName& pump, F32 timeoutin, const LLSD &timeoutResult); + } // namespace llcoro /// return type for two-pump variant of suspendUntilEventOn() |