3 files changed, 30 insertions, 0 deletions

diff --git a/linden/indra/llmessage/lliosocket.cpp b/linden/indra/llmessage/lliosocket.cpp
index dec83b0..28fee37 100644
--- a/linden/indra/llmessage/lliosocket.cpp
+++ b/linden/indra/llmessage/lliosocket.cpp
@@ -355,8 +355,11 @@ LLIOPipe::EStatus LLIOSocketReader::process_impl(
         }
         else if(APR_STATUS_IS_EAGAIN(status))
         {
+/*Commented out by Aura 9-9-8 for DEV-19961.
                 // everything is fine, but we can terminate this process pump.
+        
                 rv = STATUS_BREAK;
+*/
         }
         else
         {
diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp
index c92612f..6adf9c2 100644
--- a/linden/indra/llmessage/llpumpio.cpp
+++ b/linden/indra/llmessage/llpumpio.cpp
@@ -269,6 +269,13 @@ bool LLPumpIO::setTimeoutSeconds(F32 timeout)
         return true;
 }
 
+void LLPumpIO::adjustTimeoutSeconds(F32 delta)
+{
+        // If no chain is running, bail
+        if(current_chain_t() == mCurrentChain) return;
+        (*mCurrentChain).adjustTimeoutSeconds(delta);
+}
+
 static std::string events_2_string(apr_int16_t events)
 {
         std::ostringstream ostr;
@@ -1161,3 +1168,14 @@ void LLPumpIO::LLChainInfo::setTimeoutSeconds(F32 timeout)
                 mTimer.stop();
         }
 }
+
+void LLPumpIO::LLChainInfo::adjustTimeoutSeconds(F32 delta)
+{
+        LLMemType m1(LLMemType::MTYPE_IO_PUMP);
+        if(mTimer.getStarted())
+        {
+                F64 expiry = mTimer.expiresAt();
+                expiry += delta;
+                mTimer.setExpiryAt(expiry);
+        }
+}
diff --git a/linden/indra/llmessage/llpumpio.h b/linden/indra/llmessage/llpumpio.h
index d2392a3..daff723 100644
--- a/linden/indra/llmessage/llpumpio.h
+++ b/linden/indra/llmessage/llpumpio.h
@@ -166,6 +166,14 @@ public:
         bool setTimeoutSeconds(F32 timeout);
 
         /** 
+         * @brief Adjust the timeout of the running chain.
+         *
+         * This method has no effect if there is no timeout on the chain.
+         * @param delta The number of seconds to add to/remove from the timeout.
+         */
+        void adjustTimeoutSeconds(F32 delta);
+
+        /** 
          * @brief Set up file descriptors for for the running chain.
          * @see rebuildPollset()
          *
@@ -349,6 +357,7 @@ protected:
                 // methods
                 LLChainInfo();
                 void setTimeoutSeconds(F32 timeout);
+                void adjustTimeoutSeconds(F32 delta);
 
                 // basic member data
                 bool mInit;