Merged in SL-13783 and SL-13789

2 files changed, 7 insertions, 0 deletions

diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp
index 42c19e3b1c..0684f47df2 100644
--- a/indra/llmessage/llcoproceduremanager.cpp
+++ b/indra/llmessage/llcoproceduremanager.cpp
@@ -140,6 +140,12 @@ LLCoprocedureManager::~LLCoprocedureManager()
     close();
 }
 
+void LLCoprocedureManager::initSingleton()
+{
+    // workaround until we get mutex into initializePool
+    initializePool("VAssetStorage");
+}
+
 LLCoprocedureManager::poolPtr_t LLCoprocedureManager::initializePool(const std::string &poolName)
 {
     // Attempt to look up a pool size in the configuration.  If found use that
diff --git a/indra/llmessage/llcoproceduremanager.h b/indra/llmessage/llcoproceduremanager.h
index 70204ba02b..8540ced8cc 100644
--- a/indra/llmessage/llcoproceduremanager.h
+++ b/indra/llmessage/llcoproceduremanager.h
@@ -40,6 +40,7 @@ class LLCoprocedureManager : public LLSingleton < LLCoprocedureManager >
 {
     LLSINGLETON(LLCoprocedureManager);
     virtual ~LLCoprocedureManager();
+    /*virtual*/ void initSingleton();
 
 public:
     typedef boost::function<U32(const std::string &)> SettingQuery_t;