From 8ac53f8a76f52352643a1515fc94aaf4c8e02e2e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 18 Aug 2020 18:25:34 +0200 Subject: [PATCH] Revert "Attempt to fix the VAAssetStorage pool creation issue" because of LL's upcoming ewwwww-hackme-fix This reverts commit e7f50639447b19cb1de8255073e84bbe5a72ef5e. --- indra/llmessage/llcoproceduremanager.cpp | 11 ----------- indra/llmessage/llcoproceduremanager.h | 2 -- indra/newview/llviewerassetstorage.cpp | 4 ---- 3 files changed, 17 deletions(-) diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp index 652ac321dc..c52a02fdc9 100644 --- a/indra/llmessage/llcoproceduremanager.cpp +++ b/indra/llmessage/llcoproceduremanager.cpp @@ -272,17 +272,6 @@ void LLCoprocedureManager::close(const std::string &pool) } } -// Explicitly create the VAAssetStorage pool -void LLCoprocedureManager::createPool(const std::string& poolName) -{ - poolMap_t::iterator it = mPoolMap.find(poolName); - if (it == mPoolMap.end()) - { - initializePool(poolName); - } -} -// Explicitly create the VAAssetStorage pool - //========================================================================= LLCoprocedurePool::LLCoprocedurePool(const std::string &poolName, size_t size): mPoolName(poolName), diff --git a/indra/llmessage/llcoproceduremanager.h b/indra/llmessage/llcoproceduremanager.h index 9a9cbef6d5..70204ba02b 100644 --- a/indra/llmessage/llcoproceduremanager.h +++ b/indra/llmessage/llcoproceduremanager.h @@ -79,8 +79,6 @@ public: void close(); void close(const std::string &pool); - - void createPool(const std::string& poolName); // Explicitly create the VAAssetStorage pool private: diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp index 047d7cc3f4..50f99284a8 100644 --- a/indra/newview/llviewerassetstorage.cpp +++ b/indra/newview/llviewerassetstorage.cpp @@ -116,8 +116,6 @@ LLViewerAssetStorage::LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager * mCountSucceeded(0), mTotalBytesFetched(0) { - // Explicitly create the VAAssetStorage pool - LLCoprocedureManager::instance().createPool(VIEWER_ASSET_STORAGE_CORO_POOL); } @@ -131,8 +129,6 @@ LLViewerAssetStorage::LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager * mCountSucceeded(0), mTotalBytesFetched(0) { - // Explicitly create the VAAssetStorage pool - LLCoprocedureManager::instance().createPool(VIEWER_ASSET_STORAGE_CORO_POOL); } LLViewerAssetStorage::~LLViewerAssetStorage()