1 files changed, 8 insertions, 6 deletions

diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp
index 01a43ec..3e3f0b3 100644
--- a/linden/indra/llmessage/llpumpio.cpp
+++ b/linden/indra/llmessage/llpumpio.cpp
@@ -19,7 +19,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -180,6 +181,8 @@ LLPumpIO::LLPumpIO(apr_pool_t* pool) :
         mCallbackMutex(NULL),
         mCurrentChain(mRunningChains.end())
 {
+        mCurrentChain = mRunningChains.end();
+
         LLMemType m1(LLMemType::MTYPE_IO_PUMP);
         initialize(pool);
 }
@@ -273,12 +276,11 @@ bool LLPumpIO::setTimeoutSeconds(F32 timeout)
 
 void LLPumpIO::adjustTimeoutSeconds(F32 delta)
 {
-        // If no chain is running, bail
-        if(mRunningChains.end() == mCurrentChain) 
+        // Ensure a chain is running
+        if(mRunningChains.end() != mCurrentChain)
         {
-                return;
+                (*mCurrentChain).adjustTimeoutSeconds(delta);
         }
-        (*mCurrentChain).adjustTimeoutSeconds(delta);
 }
 
 static std::string events_2_string(apr_int16_t events)
@@ -548,7 +550,7 @@ void LLPumpIO::pump(const S32& poll_timeout)
         //lldebugs << "Running chain count: " << mRunningChains.size() << llendl;
         running_chains_t::iterator run_chain = mRunningChains.begin();
         bool process_this_chain = false;
-        for(; run_chain != mRunningChains.end(); )
+        while( run_chain != mRunningChains.end() )
         {
                 PUMP_DEBUG;
                 if((*run_chain).mInit