diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-01 21:39:25 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-01 21:39:25 +0000 |
| commit | 4ecb9cb63e4993b3b4bc65d73ed255139b5c3f75 (patch) | |
| tree | 48d9bb9a1ae468ecdbd53cf21a598d66ee8eced3 /indra/llmessage/llpumpio.h | |
| parent | f5e9ce7e47694e349a4eb28b052016b11e1bdf81 (diff) | |
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
Diffstat (limited to 'indra/llmessage/llpumpio.h')
| -rw-r--r-- | indra/llmessage/llpumpio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmessage/llpumpio.h b/indra/llmessage/llpumpio.h index 50f7411298..5edfbdf8ee 100644 --- a/indra/llmessage/llpumpio.h +++ b/indra/llmessage/llpumpio.h @@ -227,6 +227,7 @@ public: * chain has a file descriptor ready, <code>process()</code> will * be called for all pipes which have requested it. */ + void pump(const S32& poll_timeout); void pump(); /** |