diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 10:09:03 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 10:09:03 -0400 |
| commit | 3da45a3cd1e4a7984e2e41ab92ad9f97166aa3a6 (patch) | |
| tree | be99785bd263e745020de6456e6449ca9da62f3d /indra/llmessage/lliosocket.h | |
| parent | 1716b8428f88989b2b8898e27cc137e7746a4805 (diff) | |
| parent | 021ce5ccaf10e140fe114c586466ccea8ea7dbdf (diff) | |
merge
Diffstat (limited to 'indra/llmessage/lliosocket.h')
| -rw-r--r-- | indra/llmessage/lliosocket.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llmessage/lliosocket.h b/indra/llmessage/lliosocket.h index 6806e5084a..e0f6c1e34d 100644 --- a/indra/llmessage/lliosocket.h +++ b/indra/llmessage/lliosocket.h @@ -153,9 +153,16 @@ protected: LLSocket(apr_socket_t* socket, apr_pool_t* pool); /** - * @brief Set default socket options. + * @brief Set default socket options, with SO_NONBLOCK = 0 and a timeout in us. + * @param timeout Number of microseconds to wait on this socket. Any + * negative number means block-forever. TIMEOUT OF 0 IS NON-PORTABLE. */ - void setOptions(); + void setBlocking(S32 timeout); + + /** + * @brief Set default socket options, with SO_NONBLOCK = 1 and timeout = 0. + */ + void setNonBlocking(); public: /** |