diff options
| author | Squire <squire@lindenlab.com> | 2011-06-28 11:55:27 -0700 |
|---|---|---|
| committer | Squire <squire@lindenlab.com> | 2011-06-28 11:55:27 -0700 |
| commit | 7db0cdefe044ce61f35de1ea421f0f5fb3fc09bf (patch) | |
| tree | e3f74b73bf58d7ba56571e57ba70b72f39d8b038 /indra/llmessage/lliosocket.h | |
| parent | 03969822f5cff99c124772466bf4e86da9fa05aa (diff) | |
| parent | c91d6962337e3394038d72b173431dceffb44317 (diff) | |
STORM-1447, STORM-1446
merged from
https://bitbucket.org/stone_linden/viewer-development-storm-1368
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: /** |