diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-11-21 01:18:39 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-11-21 01:18:39 +0000 |
| commit | ac68eb16a2dac453fe85b7218297f561b8fc96ca (patch) | |
| tree | a1e26d95326b610c6d2a740ee80071bfb866d8e9 /indra/llmessage | |
| parent | 77c108b2c4879fbbb168f91fed7763a0b557ecab (diff) | |
Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. 101837 to 103519
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llpumpio.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp index 39e9a8b952..7a6605d16a 100644 --- a/indra/llmessage/llpumpio.cpp +++ b/indra/llmessage/llpumpio.cpp @@ -177,7 +177,8 @@ LLPumpIO::LLPumpIO(apr_pool_t* pool) : mCurrentPool(NULL), mCurrentPoolReallocCount(0), mChainsMutex(NULL), - mCallbackMutex(NULL) + mCallbackMutex(NULL), + mCurrentChain(mRunningChains.end()) { LLMemType m1(LLMemType::MTYPE_IO_PUMP); initialize(pool); @@ -273,7 +274,10 @@ bool LLPumpIO::setTimeoutSeconds(F32 timeout) void LLPumpIO::adjustTimeoutSeconds(F32 delta) { // If no chain is running, bail - if(current_chain_t() == mCurrentChain) return; + if(mRunningChains.end() == mCurrentChain) + { + return; + } (*mCurrentChain).adjustTimeoutSeconds(delta); } |