From dedd02010126a481ea1edad6ed618e10023c7f53 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 18 Feb 2009 01:18:14 -0700 Subject: Fixed crash in Top Scripts --- ChangeLog.txt | 6 ++++++ linden/indra/llmessage/llpumpio.cpp | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 3d8166f..c2c4669 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,9 @@ +2009-02-17 McCabe Maxsted + + * linden/indra/llmessage/llpumpio.cpp: + Fixed crash in Top Scripts. + + 2009-02-15 McCabe Maxsted * linden/indra/llcommon/llsdserialize.cpp: diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp index 9ce0bab..467502b 100644 --- a/linden/indra/llmessage/llpumpio.cpp +++ b/linden/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); } -- cgit v1.1