Merge pull request #4176 from secondlife/geenz/2025.04-to-develop

Merge 2025.04 into develop

2 files changed, 9 insertions, 2 deletions

diff --git a/indra/llmessage/llpacketring.cpp b/indra/llmessage/llpacketring.cpp
index eb6650c6c5..b8284334ea 100644
--- a/indra/llmessage/llpacketring.cpp
+++ b/indra/llmessage/llpacketring.cpp
@@ -209,8 +209,14 @@ S32 LLPacketRing::receiveOrDropBufferedPacket(char *datap, bool drop)
 
     if (!drop)
     {
-        assert(packet_size > 0);
-        memcpy(datap, packet->getData(), packet_size);
+        if (packet_size > 0)
+        {
+            memcpy(datap, packet->getData(), packet_size);
+        }
+        else
+        {
+            assert(false);
+        }
     }
     else
     {
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp
index d04ca52ad6..d79d5c3a11 100644
--- a/indra/llmessage/llproxy.cpp
+++ b/indra/llmessage/llproxy.cpp
@@ -506,6 +506,7 @@ static apr_status_t tcp_blocking_handshake(LLSocket::ptr_t handle, char * dataou
         rv = apr_socket_recv(apr_socket, datain, &maxinlen);
         if (rv != APR_SUCCESS)
         {
+            // if rv == 70060 it's WSAETIMEDOUT
             char buf[MAX_STRING];
             LL_WARNS("Proxy") << "Error receiving data from proxy control channel, status: " << rv << " " << apr_strerror(rv, buf, MAX_STRING) << LL_ENDL;
             ll_apr_warn_status(rv);