diff options
Diffstat (limited to 'indra/newview/llcoproceduremanager.cpp')
| -rw-r--r-- | indra/newview/llcoproceduremanager.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/indra/newview/llcoproceduremanager.cpp b/indra/newview/llcoproceduremanager.cpp index 3f5fe7a582..3ecb323cab 100644 --- a/indra/newview/llcoproceduremanager.cpp +++ b/indra/newview/llcoproceduremanager.cpp @@ -1,5 +1,5 @@ /** -* @file llupdloadmanager.cpp +* @file llcoproceduremanager.cpp * @author Rider Linden * @brief Singleton class for managing asset uploads to the sim. * @@ -44,18 +44,6 @@ LLCoprocedureManager::LLCoprocedureManager(): mCoroMapping(), mHTTPPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID) { - initializeManager(); -} - -LLCoprocedureManager::~LLCoprocedureManager() -{ - shutdown(); -} - -//========================================================================= -void LLCoprocedureManager::initializeManager() -{ - mShutdown = false; // *TODO: Retrieve the actual number of concurrent coroutines fro gSavedSettings and // clamp to a "reasonable" number. @@ -74,6 +62,13 @@ void LLCoprocedureManager::initializeManager() mWakeupTrigger.post(LLSD()); } +LLCoprocedureManager::~LLCoprocedureManager() +{ + shutdown(); +} + +//========================================================================= + void LLCoprocedureManager::shutdown(bool hardShutdown) { CoroAdapterMap_t::iterator it; @@ -123,7 +118,7 @@ void LLCoprocedureManager::cancelCoprocedure(const LLUUID &id) return; } - for (AssetQueue_t::iterator it = mPendingCoprocs.begin(); it != mPendingCoprocs.end(); ++it) + for (CoprocQueue_t::iterator it = mPendingCoprocs.begin(); it != mPendingCoprocs.end(); ++it) { if ((*it)->mId == id) { @@ -164,6 +159,10 @@ void LLCoprocedureManager::coprocedureInvokerCoro(LLCoros::self& self, LLCoreHtt LL_WARNS() << "Coprocedure(" << coproc->mName << ") id=" << coproc->mId.asString() << " threw an exception! Message=\"" << e.what() << "\"" << LL_ENDL; } + catch (...) + { + LL_WARNS() << "A non std::exception was thrown from " << coproc->mName << " with id=" << coproc->mId << "." << LL_ENDL; + } LL_INFOS() << "Finished coprocedure(" << coproc->mName << ")" << LL_ENDL; |