diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-30 16:00:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-30 16:00:09 -0400 |
| commit | 06b314aaf2d1d1176c846a3bdb17738de98252b7 (patch) | |
| tree | e6fbc2b8375dfcbbab9d4e9c65935a3b38eeeda9 /indra/llmessage/lliosocket.h | |
| parent | 5c77e714a6febf9df23d8541064e0d2fe680ccce (diff) | |
| parent | f07173a9689237bf2d8218600c15d6bf4d047cdc (diff) | |
merge changes for latest viewer-development
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: /** |