Merge branch 'main' into webrtc-voice

1 files changed, 2 insertions, 4 deletions

diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp
index 3e1e5daa02..8a395c26a8 100644
--- a/indra/llmessage/llproxy.cpp
+++ b/indra/llmessage/llproxy.cpp
@@ -465,7 +465,7 @@ void LLProxy::applyProxySettings(CURL* handle)
 /**
  * @brief Send one TCP packet and receive one in return.
  *
- * This operation is done synchronously with a 1000ms timeout. Therefore, it should not be used when a blocking
+ * This operation is done synchronously with a 100ms timeout. Therefore, it should not be used when a blocking
  * operation would impact the operation of the viewer.
  *
  * @param handle_ptr    Pointer to a connected LLSocket of type STREAM_TCP.
@@ -482,7 +482,7 @@ static apr_status_t tcp_blocking_handshake(LLSocket::ptr_t handle, char * dataou
 
     apr_size_t expected_len = outlen;
 
-    handle->setBlocking(1000);
+    handle->setBlocking(100000); // 100ms, 100000us. Should be sufficient for localhost, nearby network
 
     rv = apr_socket_send(apr_socket, dataout, &outlen);
     if (APR_SUCCESS != rv)
@@ -498,8 +498,6 @@ static apr_status_t tcp_blocking_handshake(LLSocket::ptr_t handle, char * dataou
         rv = -1;
     }
 
-    ms_sleep(1);
-
     if (APR_SUCCESS == rv)
     {
         expected_len = maxinlen;