MAINT-5575: Convert the Experience cache into a coro based singleton.

--HG--
branch : MAINT-5575

16 files changed, 44 insertions, 561 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index fe9c7c0fc0..090879e372 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -161,7 +161,6 @@ set(viewer_SOURCE_FILES
     llconversationloglistitem.cpp
     llconversationmodel.cpp
     llconversationview.cpp
-    llcoproceduremanager.cpp
     llcurrencyuimanager.cpp
     llcylinder.cpp
     lldateutil.cpp
@@ -771,7 +770,6 @@ set(viewer_HEADER_FILES
     llconversationloglistitem.h
     llconversationmodel.h
     llconversationview.h
-    llcoproceduremanager.h
     llcurrencyuimanager.h
     llcylinder.h
     lldateutil.h
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index e7dd378edd..3316f1e654 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -953,6 +953,15 @@ BOOL LLAgent::inPrelude()
 }
 
 
+std::string LLAgent::getRegionCapability(const std::string &name)
+{
+    if (!mRegionp)
+        return std::string();
+    
+    return mRegionp->getCapability(name);
+}
+
+
 //-----------------------------------------------------------------------------
 // canManageEstate()
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 0ba3dea427..5731f4db89 100755
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -262,6 +262,9 @@ public:
 	LLHost			getRegionHost() const;
 	BOOL			inPrelude();
 
+    // Capability 
+    std::string     getRegionCapability(const std::string &name); // short hand for if (getRegion()) { getRegion()->getCapability(name) }
+
 	/**
 	 * Register a boost callback to be called when the agent changes regions
 	 * Note that if you need to access a capability for the region, you may need to wait
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 9b9b591cd1..e13a9d96c7 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -228,7 +228,7 @@
 #include "llmachineid.h"
 #include "llmainlooprepeater.h"
 
-
+#include "llcoproceduremanager.h"
 #include "llviewereventrecorder.h"
 
 
@@ -755,8 +755,11 @@ void fast_exit(int rc)
 {
 	_exit(rc);
 }
+
+
 }
 
+
 bool LLAppViewer::init()
 {	
 	setupErrorHandling(mSecondInstance);
@@ -1216,6 +1219,12 @@ bool LLAppViewer::init()
 
 	LLAgentLanguage::init();
 
+    /// Tell the Coprocedure manager how to discover and store the pool sizes
+    // what I wanted
+    LLCoprocedureManager::getInstance()->setPropertyMethods(
+        boost::bind(&LLControlGroup::getU32, boost::ref(gSavedSettings), _1),
+        boost::bind(&LLControlGroup::declareU32, boost::ref(gSavedSettings), _1, _2, _3, LLControlVariable::PERSIST_ALWAYS));
+
 	return true;
 }
 
@@ -4700,31 +4709,6 @@ void LLAppViewer::saveNameCache()
 }
 
 
-void LLAppViewer::saveExperienceCache()
-{
-	std::string filename =
-		gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "experience_cache.xml");
-	LL_INFOS("ExperienceCache") << "Saving " << filename << LL_ENDL;
-	llofstream cache_stream(filename.c_str());
-	if(cache_stream.is_open())
-	{
-		LLExperienceCache::exportFile(cache_stream);
-	}
-}
-
-void LLAppViewer::loadExperienceCache()
-{
-	std::string filename =
-		gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "experience_cache.xml");
-	LL_INFOS("ExperienceCache") << "Loading " << filename << LL_ENDL;
-	llifstream cache_stream(filename.c_str());
-	if(cache_stream.is_open())
-	{
-		LLExperienceCache::importFile(cache_stream);
-	}
-}
-
-
 /*!	@brief		This class is an LLFrameTimer that can be created with
 				an elapsed time that starts counting up from the given value
 				rather than 0.0.
@@ -4920,7 +4904,6 @@ void LLAppViewer::idle()
 	    // floating throughout the various object lists.
 	    //
 		idleNameCache();
-		idleExperienceCache();
 		idleNetwork();
 	    	        
 
@@ -5350,22 +5333,6 @@ void LLAppViewer::idleNameCache()
 	LLAvatarNameCache::idle();
 }
 
-void LLAppViewer::idleExperienceCache()
-{
-	LLViewerRegion* region = gAgent.getRegion();
-	if (!region) return;
-	
-	std::string lookup_url=region->getCapability("GetExperienceInfo"); 
-	if(!lookup_url.empty() && *lookup_url.rbegin() != '/')
-	{
-		lookup_url += '/';
-	}
-	
-	LLExperienceCache::setLookupURL(lookup_url);
-
-	LLExperienceCache::idle();
-}
-
 //
 // Handle messages, and all message related stuff
 //
@@ -5528,7 +5495,9 @@ void LLAppViewer::disconnectViewer()
 	}
 
 	saveNameCache();
-	saveExperienceCache();
+    LLExperienceCache *expCache = LLExperienceCache::getIfExists();
+    if (expCache)
+        expCache->cleanup();
 
 	// close inventory interface, close all windows
 	LLFloaterInventory::cleanup();
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 718871138e..e8a1ca036b 100755
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -122,9 +122,6 @@ public:
     void loadNameCache();
     void saveNameCache();
 
-	void loadExperienceCache();
-	void saveExperienceCache();
-
 	void removeMarkerFiles();
 	
 	void removeDumpDir();
@@ -233,7 +230,6 @@ private:
     void idle(); 
     void idleShutdown();
 	// update avatar SLID and display name caches
-	void idleExperienceCache();
 	void idleNameCache();
     void idleNetwork();
 
diff --git a/indra/newview/llcoproceduremanager.cpp b/indra/newview/llcoproceduremanager.cpp
deleted file mode 100644
index db01c13079..0000000000
--- a/indra/newview/llcoproceduremanager.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/**
-* @file LLCoprocedurePool.cpp
-* @author Rider Linden
-* @brief Singleton class for managing asset uploads to the sim.
-*
-* $LicenseInfo:firstyear=2015&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2015, Linden Research, Inc.
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation;
-* version 2.1 of the License only.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*
-* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-* $/LicenseInfo$
-*/
-
-#include "llviewerprecompiledheaders.h"
-#include "linden_common.h" 
-
-#include "llviewercontrol.h"
-
-#include "llcoproceduremanager.h"
-
-//=========================================================================
-// Map of pool sizes for known pools
-static std::map<std::string, U32> DefaultPoolSizes;
-
-// *TODO$: When C++11 this can be initialized here as follows:
-// = {{"AIS", 25}, {"Upload", 1}}
-
-#define DEFAULT_POOL_SIZE 5
-
-//=========================================================================
-class LLCoprocedurePool: private boost::noncopyable
-{
-public:
-    typedef LLCoprocedureManager::CoProcedure_t CoProcedure_t;
-
-    LLCoprocedurePool(const std::string &name, size_t size);
-    virtual ~LLCoprocedurePool();
-
-    /// Places the coprocedure on the queue for processing. 
-    /// 
-    /// @param name Is used for debugging and should identify this coroutine.
-    /// @param proc Is a bound function to be executed 
-    /// 
-    /// @return This method returns a UUID that can be used later to cancel execution.
-    LLUUID enqueueCoprocedure(const std::string &name, CoProcedure_t proc);
-
-    /// Cancel a coprocedure. If the coprocedure is already being actively executed 
-    /// this method calls cancelYieldingOperation() on the associated HttpAdapter
-    /// If it has not yet been dequeued it is simply removed from the queue.
-    bool cancelCoprocedure(const LLUUID &id);
-
-    /// Requests a shutdown of the upload manager. Passing 'true' will perform 
-    /// an immediate kill on the upload coroutine.
-    void shutdown(bool hardShutdown = false);
-
-    /// Returns the number of coprocedures in the queue awaiting processing.
-    ///
-    inline size_t countPending() const
-    {
-        return mPendingCoprocs.size();
-    }
-
-    /// Returns the number of coprocedures actively being processed.
-    ///
-    inline size_t countActive() const
-    {
-        return mActiveCoprocs.size();
-    }
-
-    /// Returns the total number of coprocedures either queued or in active processing.
-    ///
-    inline size_t count() const
-    {
-        return countPending() + countActive();
-    }
-
-private:
-    struct QueuedCoproc
-    {
-        typedef boost::shared_ptr<QueuedCoproc> ptr_t;
-
-        QueuedCoproc(const std::string &name, const LLUUID &id, CoProcedure_t proc) :
-            mName(name),
-            mId(id),
-            mProc(proc)
-        {}
-
-        std::string mName;
-        LLUUID mId;
-        CoProcedure_t mProc;
-    };
-
-    // we use a deque here rather than std::queue since we want to be able to 
-    // iterate through the queue and potentially erase an entry from the middle.
-    typedef std::deque<QueuedCoproc::ptr_t>  CoprocQueue_t;
-    typedef std::map<LLUUID, LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t> ActiveCoproc_t;
-
-    std::string     mPoolName;
-    size_t          mPoolSize;
-    CoprocQueue_t   mPendingCoprocs;
-    ActiveCoproc_t  mActiveCoprocs;
-    bool            mShutdown;
-    LLEventStream   mWakeupTrigger;
-
-    typedef std::map<std::string, LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t> CoroAdapterMap_t;
-    LLCore::HttpRequest::policy_t mHTTPPolicy;
-
-    CoroAdapterMap_t mCoroMapping;
-
-    void coprocedureInvokerCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t httpAdapter);
-
-};
-
-//=========================================================================
-LLCoprocedureManager::LLCoprocedureManager()
-{
-    DefaultPoolSizes.insert(std::map<std::string, U32>::value_type("Upload", 1));
-    DefaultPoolSizes.insert(std::map<std::string, U32>::value_type("AIS", 25));
-}
-
-LLCoprocedureManager::~LLCoprocedureManager()
-{
-
-}
-
-LLCoprocedureManager::poolPtr_t LLCoprocedureManager::initializePool(const std::string &poolName)
-{
-    // Attempt to look up a pool size in the configuration.  If found use that
-    std::string keyName = "PoolSize" + poolName;
-    int size = 5;
-
-    size = gSavedSettings.getU32(keyName);
-    if (size == 0)
-    {   // if not found grab the know default... if there is no known 
-        // default use a reasonable number like 5.
-        std::map<std::string, U32>::iterator it = DefaultPoolSizes.find(poolName);
-        if (it == DefaultPoolSizes.end())
-            size = DEFAULT_POOL_SIZE;
-        else
-            size = (*it).second;
-        gSavedSettings.declareU32(keyName, size, "Coroutine Pool size for " + poolName, LLControlVariable::PERSIST_ALWAYS);
-        LL_WARNS() << "LLCoprocedureManager: No setting for \"" << keyName << "\" setting pool size to default of " << size << LL_ENDL;
-    }
-
-    poolPtr_t pool = poolPtr_t(new LLCoprocedurePool(poolName, size));
-    mPoolMap.insert(poolMap_t::value_type(poolName, pool));
-
-    return pool;
-}
-
-//-------------------------------------------------------------------------
-LLUUID LLCoprocedureManager::enqueueCoprocedure(const std::string &pool, const std::string &name, CoProcedure_t proc)
-{
-    // Attempt to find the pool and enqueue the procedure.  If the pool does 
-    // not exist, create it.
-    poolPtr_t targetPool;
-    poolMap_t::iterator it = mPoolMap.find(pool);
-
-    if (it == mPoolMap.end())
-    {
-        targetPool = initializePool(pool);
-    }
-    else
-    {
-        targetPool = (*it).second;
-    }
-
-    if (!targetPool)
-    {
-        LL_WARNS() << "LLCoprocedureManager unable to create coprocedure pool named \"" << pool << "\"" << LL_ENDL;
-        return LLUUID::null;
-    }
-
-    return targetPool->enqueueCoprocedure(name, proc);
-}
-
-void LLCoprocedureManager::cancelCoprocedure(const LLUUID &id)
-{
-    for (poolMap_t::const_iterator it = mPoolMap.begin(); it != mPoolMap.end(); ++it)
-    {
-        if ((*it).second->cancelCoprocedure(id))
-            return;
-    }
-    LL_INFOS() << "Coprocedure not found." << LL_ENDL;
-}
-
-void LLCoprocedureManager::shutdown(bool hardShutdown)
-{
-    for (poolMap_t::const_iterator it = mPoolMap.begin(); it != mPoolMap.end(); ++it)
-    {
-        (*it).second->shutdown(hardShutdown);
-    }
-    mPoolMap.clear();
-}
-
-//-------------------------------------------------------------------------
-size_t LLCoprocedureManager::countPending() const
-{
-    size_t count = 0;
-    for (poolMap_t::const_iterator it = mPoolMap.begin(); it != mPoolMap.end(); ++it)
-    {
-        count += (*it).second->countPending();
-    }
-    return count;
-}
-
-size_t LLCoprocedureManager::countPending(const std::string &pool) const
-{
-    poolMap_t::const_iterator it = mPoolMap.find(pool);
-
-    if (it == mPoolMap.end())
-        return 0;
-    return (*it).second->countPending();
-}
-
-size_t LLCoprocedureManager::countActive() const
-{
-    size_t count = 0;
-    for (poolMap_t::const_iterator it = mPoolMap.begin(); it != mPoolMap.end(); ++it)
-    {
-        count += (*it).second->countActive();
-    }
-    return count;
-}
-
-size_t LLCoprocedureManager::countActive(const std::string &pool) const
-{
-    poolMap_t::const_iterator it = mPoolMap.find(pool);
-
-    if (it == mPoolMap.end())
-        return 0;
-    return (*it).second->countActive();
-}
-
-size_t LLCoprocedureManager::count() const
-{
-    size_t count = 0;
-    for (poolMap_t::const_iterator it = mPoolMap.begin(); it != mPoolMap.end(); ++it)
-    {
-        count += (*it).second->count();
-    }
-    return count;
-}
-
-size_t LLCoprocedureManager::count(const std::string &pool) const
-{
-    poolMap_t::const_iterator it = mPoolMap.find(pool);
-
-    if (it == mPoolMap.end())
-        return 0;
-    return (*it).second->count();
-}
-
-//=========================================================================
-LLCoprocedurePool::LLCoprocedurePool(const std::string &poolName, size_t size):
-    mPoolName(poolName),
-    mPoolSize(size),
-    mPendingCoprocs(),
-    mShutdown(false),
-    mWakeupTrigger("CoprocedurePool" + poolName, true),
-    mCoroMapping(),
-    mHTTPPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID)
-{
-    for (size_t count = 0; count < mPoolSize; ++count)
-    {
-        LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t httpAdapter =
-            LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t(
-            new LLCoreHttpUtil::HttpCoroutineAdapter( mPoolName + "Adapter", mHTTPPolicy));
-
-        std::string uploadCoro = LLCoros::instance().launch("LLCoprocedurePool("+mPoolName+")::coprocedureInvokerCoro",
-            boost::bind(&LLCoprocedurePool::coprocedureInvokerCoro, this, httpAdapter));
-
-        mCoroMapping.insert(CoroAdapterMap_t::value_type(uploadCoro, httpAdapter));
-    }
-
-    LL_INFOS() << "Created coprocedure pool named \"" << mPoolName << "\" with " << size << " items." << LL_ENDL;
-
-    mWakeupTrigger.post(LLSD());
-}
-
-LLCoprocedurePool::~LLCoprocedurePool() 
-{
-    shutdown();
-}
-
-//-------------------------------------------------------------------------
-void LLCoprocedurePool::shutdown(bool hardShutdown)
-{
-    CoroAdapterMap_t::iterator it;
-
-    for (it = mCoroMapping.begin(); it != mCoroMapping.end(); ++it)
-    {
-        if (!(*it).first.empty())
-        {
-            if (hardShutdown)
-            {
-                LLCoros::instance().kill((*it).first);
-            }
-        }
-        if ((*it).second)
-        {
-            (*it).second->cancelYieldingOperation();
-        }
-    }
-
-    mShutdown = true;
-    mCoroMapping.clear();
-    mPendingCoprocs.clear();
-}
-
-//-------------------------------------------------------------------------
-LLUUID LLCoprocedurePool::enqueueCoprocedure(const std::string &name, LLCoprocedurePool::CoProcedure_t proc)
-{
-    LLUUID id(LLUUID::generateNewID());
-
-    mPendingCoprocs.push_back(QueuedCoproc::ptr_t(new QueuedCoproc(name, id, proc)));
-    LL_INFOS() << "Coprocedure(" << name << ") enqueued with id=" << id.asString() << " in pool \"" << mPoolName << "\"" << LL_ENDL;
-
-    mWakeupTrigger.post(LLSD());
-
-    return id;
-}
-
-bool LLCoprocedurePool::cancelCoprocedure(const LLUUID &id)
-{
-    // first check the active coroutines.  If there, remove it and return.
-    ActiveCoproc_t::iterator itActive = mActiveCoprocs.find(id);
-    if (itActive != mActiveCoprocs.end())
-    {
-        LL_INFOS() << "Found and canceling active coprocedure with id=" << id.asString() << " in pool \"" << mPoolName << "\"" << LL_ENDL;
-        (*itActive).second->cancelYieldingOperation();
-        mActiveCoprocs.erase(itActive);
-        return true;
-    }
-
-    for (CoprocQueue_t::iterator it = mPendingCoprocs.begin(); it != mPendingCoprocs.end(); ++it)
-    {
-        if ((*it)->mId == id)
-        {
-            LL_INFOS() << "Found and removing queued coroutine(" << (*it)->mName << ") with Id=" << id.asString() << " in pool \"" << mPoolName << "\"" << LL_ENDL;
-            mPendingCoprocs.erase(it);
-            return true;
-        }
-    }
-
-    LL_INFOS() << "Coprocedure with Id=" << id.asString() << " was not found." << " in pool \"" << mPoolName << "\"" << LL_ENDL;
-    return false;
-}
-
-//-------------------------------------------------------------------------
-void LLCoprocedurePool::coprocedureInvokerCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t httpAdapter)
-{
-    LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
-
-    while (!mShutdown)
-    {
-        llcoro::waitForEventOn(mWakeupTrigger);
-        if (mShutdown)
-            break;
-        
-        while (!mPendingCoprocs.empty())
-        {
-            QueuedCoproc::ptr_t coproc = mPendingCoprocs.front();
-            mPendingCoprocs.pop_front();
-            mActiveCoprocs.insert(ActiveCoproc_t::value_type(coproc->mId, httpAdapter));
-
-            LL_INFOS() << "Dequeued and invoking coprocedure(" << coproc->mName << ") with id=" << coproc->mId.asString() << " in pool \"" << mPoolName << "\"" << LL_ENDL;
-
-            try
-            {
-                coproc->mProc(httpAdapter, coproc->mId);
-            }
-            catch (std::exception &e)
-            {
-                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 << "." << " in pool \"" << mPoolName << "\"" << LL_ENDL;
-            }
-
-            LL_INFOS() << "Finished coprocedure(" << coproc->mName << ")" << " in pool \"" << mPoolName << "\"" << LL_ENDL;
-
-            ActiveCoproc_t::iterator itActive = mActiveCoprocs.find(coproc->mId);
-            if (itActive != mActiveCoprocs.end())
-            {
-                mActiveCoprocs.erase(itActive);
-            }
-        }
-    }
-}
diff --git a/indra/newview/llcoproceduremanager.h b/indra/newview/llcoproceduremanager.h
deleted file mode 100644
index d7f74af76b..0000000000
--- a/indra/newview/llcoproceduremanager.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
-* @file llcoproceduremanager.h
-* @author Rider Linden
-* @brief Singleton class for managing asset uploads to the sim.
-*
-* $LicenseInfo:firstyear=2015&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2015, Linden Research, Inc.
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation;
-* version 2.1 of the License only.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*
-* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-* $/LicenseInfo$
-*/
-
-#ifndef LL_COPROCEDURE_MANAGER_H
-#define LL_COPROCEDURE_MANAGER_H
-
-#include "lleventcoro.h"
-#include "llcoros.h"
-#include "llcorehttputil.h"
-#include "lluuid.h"
-
-class LLCoprocedurePool;
-
-class LLCoprocedureManager : public LLSingleton < LLCoprocedureManager >
-{
-public:
-    typedef boost::function<void(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &, const LLUUID &id)> CoProcedure_t;
-
-    LLCoprocedureManager();
-    virtual ~LLCoprocedureManager();
-
-    /// Places the coprocedure on the queue for processing. 
-    /// 
-    /// @param name Is used for debugging and should identify this coroutine.
-    /// @param proc Is a bound function to be executed 
-    /// 
-    /// @return This method returns a UUID that can be used later to cancel execution.
-    LLUUID enqueueCoprocedure(const std::string &pool, const std::string &name, CoProcedure_t proc);
-
-    /// Cancel a coprocedure. If the coprocedure is already being actively executed 
-    /// this method calls cancelYieldingOperation() on the associated HttpAdapter
-    /// If it has not yet been dequeued it is simply removed from the queue.
-    void cancelCoprocedure(const LLUUID &id);
-
-    /// Requests a shutdown of the upload manager. Passing 'true' will perform 
-    /// an immediate kill on the upload coroutine.
-    void shutdown(bool hardShutdown = false);
-
-    /// Returns the number of coprocedures in the queue awaiting processing.
-    ///
-    size_t countPending() const;
-    size_t countPending(const std::string &pool) const;
-
-    /// Returns the number of coprocedures actively being processed.
-    ///
-    size_t countActive() const;
-    size_t countActive(const std::string &pool) const;
-
-    /// Returns the total number of coprocedures either queued or in active processing.
-    ///
-    size_t count() const;
-    size_t count(const std::string &pool) const;
-
-private:
-    typedef boost::shared_ptr<LLCoprocedurePool> poolPtr_t;
-    typedef std::map<std::string, poolPtr_t> poolMap_t;
-
-    poolMap_t mPoolMap;
-
-    poolPtr_t initializePool(const std::string &poolName);
-};
-
-#endif
diff --git a/indra/newview/llexperienceassociationresponder.cpp b/indra/newview/llexperienceassociationresponder.cpp
index b50c81eedc..cd4a7516b1 100644
--- a/indra/newview/llexperienceassociationresponder.cpp
+++ b/indra/newview/llexperienceassociationresponder.cpp
@@ -83,7 +83,7 @@ void ExperienceAssociationResponder::httpSuccess()
         return;
     }
 
-    LLExperienceCache::get(getContent()["experience"].asUUID(), boost::bind(&ExperienceAssociationResponder::sendResult, this, _1));
+    LLExperienceCache::getInstance()->get(getContent()["experience"].asUUID(), boost::bind(&ExperienceAssociationResponder::sendResult, this, _1));
 
 }
 
diff --git a/indra/newview/llfloaterexperienceprofile.cpp b/indra/newview/llfloaterexperienceprofile.cpp
index 197162487d..8a04f9e4cc 100644
--- a/indra/newview/llfloaterexperienceprofile.cpp
+++ b/indra/newview/llfloaterexperienceprofile.cpp
@@ -99,7 +99,7 @@ public:
         if(params.size() != 2 || params[1].asString() != "profile")
             return false;
 
-        LLExperienceCache::get(params[0].asUUID(), boost::bind(&LLExperienceHandler::experienceCallback, this, _1));
+        LLExperienceCache::getInstance()->get(params[0].asUUID(), boost::bind(&LLExperienceHandler::experienceCallback, this, _1));
         return true;
     }
 
@@ -288,8 +288,8 @@ BOOL LLFloaterExperienceProfile::postBuild()
 
     if (mExperienceId.notNull())
     {
-        LLExperienceCache::fetch(mExperienceId, true);
-        LLExperienceCache::get(mExperienceId, boost::bind(&LLFloaterExperienceProfile::experienceCallback, 
+        LLExperienceCache::getInstance()->fetch(mExperienceId, true);
+        LLExperienceCache::getInstance()->get(mExperienceId, boost::bind(&LLFloaterExperienceProfile::experienceCallback,
             getDerivedHandle<LLFloaterExperienceProfile>(), _1)); 
         
         LLViewerRegion* region = gAgent.getRegion();
@@ -799,8 +799,8 @@ void LLFloaterExperienceProfile::onSaveComplete( const LLSD& content )
     }
  
     refreshExperience(*it);
-    LLExperienceCache::insert(*it);
-    LLExperienceCache::fetch(id, true);
+    LLExperienceCache::getInstance()->insert(*it);
+    LLExperienceCache::getInstance()->fetch(id, true);
 
     if(mSaveCompleteAction==VIEW)
     {
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 370d0f4f1b..714d8d0e8f 100755
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -268,7 +268,7 @@ void LLFloaterReporter::getExperienceInfo(const LLUUID& experience_id)
 
 	if (LLUUID::null != mExperienceID)
 	{
-		const LLSD& experience = LLExperienceCache::get(mExperienceID);
+        const LLSD& experience = LLExperienceCache::getInstance()->get(mExperienceID);
 		std::stringstream desc;
 
 		if(experience.isDefined())
diff --git a/indra/newview/llpanelexperiencelisteditor.cpp b/indra/newview/llpanelexperiencelisteditor.cpp
index fc4ee9862e..20fe0c52fa 100644
--- a/indra/newview/llpanelexperiencelisteditor.cpp
+++ b/indra/newview/llpanelexperiencelisteditor.cpp
@@ -183,7 +183,7 @@ void LLPanelExperienceListEditor::onItems()
 		columns[0]["value"] = getString("loading");
 		mItems->addElement(item);
 
-		LLExperienceCache::get(experience, boost::bind(&LLPanelExperienceListEditor::experienceDetailsCallback, 
+        LLExperienceCache::getInstance()->get(experience, boost::bind(&LLPanelExperienceListEditor::experienceDetailsCallback,
 			getDerivedHandle<LLPanelExperienceListEditor>(), _1));
 	}
 
diff --git a/indra/newview/llpanelexperiencelog.cpp b/indra/newview/llpanelexperiencelog.cpp
index df03ef7526..9329d900b1 100644
--- a/indra/newview/llpanelexperiencelog.cpp
+++ b/indra/newview/llpanelexperiencelog.cpp
@@ -140,7 +140,7 @@ void LLPanelExperienceLog::refresh()
 				}
 				const LLSD event = dayArray[i];
 				LLUUID id = event[LLExperienceCache::EXPERIENCE_ID].asUUID();
-				const LLSD& experience = LLExperienceCache::get(id);
+                const LLSD& experience = LLExperienceCache::getInstance()->get(id);
 				if(experience.isUndefined()){
 					waiting = true;
 					waiting_id = id;
@@ -168,7 +168,7 @@ void LLPanelExperienceLog::refresh()
 	{
 		mEventList->deleteAllItems();
 		mEventList->setCommentText(getString("loading"));
-		LLExperienceCache::get(waiting_id, boost::bind(&LLPanelExperienceLog::refresh, this));
+        LLExperienceCache::getInstance()->get(waiting_id, boost::bind(&LLPanelExperienceLog::refresh, this));
 	}
 	else
 	{
diff --git a/indra/newview/llpanelexperiencepicker.cpp b/indra/newview/llpanelexperiencepicker.cpp
index c7a353a6af..7c19e32e7e 100644
--- a/indra/newview/llpanelexperiencepicker.cpp
+++ b/indra/newview/llpanelexperiencepicker.cpp
@@ -238,7 +238,7 @@ void LLPanelExperiencePicker::processResponse( const LLUUID& query_id, const LLS
 	LLSD::array_const_iterator it = experiences.beginArray();
 	for ( ; it != experiences.endArray(); ++it)
 	{
-		LLExperienceCache::insert(*it);
+        LLExperienceCache::getInstance()->insert(*it);
 	}
 
 	getChildView(BTN_RIGHT)->setEnabled(content.has("next_page_url"));
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index a548d7b705..4f5d21b6be 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -1326,7 +1326,7 @@ void LLLiveLSLEditor::buildExperienceList()
 			position = ADD_TOP;
 		}
 		
-		const LLSD& experience = LLExperienceCache::get(id);
+        const LLSD& experience = LLExperienceCache::getInstance()->get(id);
 		if(experience.isUndefined())
 		{
 			mExperiences->add(getString("loading"), id, position);
@@ -1345,7 +1345,7 @@ void LLLiveLSLEditor::buildExperienceList()
 
 	if(!foundAssociated )
 	{
-		const LLSD& experience = LLExperienceCache::get(associated);
+        const LLSD& experience = LLExperienceCache::getInstance()->get(associated);
 		if(experience.isDefined())
 		{
 			std::string experience_name_string = experience[LLExperienceCache::NAME].asString();
@@ -1366,7 +1366,7 @@ void LLLiveLSLEditor::buildExperienceList()
 	if(last.notNull())
 	{
 		mExperiences->setEnabled(FALSE);
-		LLExperienceCache::get(last, boost::bind(&LLLiveLSLEditor::buildExperienceList, this));  
+        LLExperienceCache::getInstance()->get(last, boost::bind(&LLLiveLSLEditor::buildExperienceList, this));
 	}
 	else
 	{
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 46f75c4f57..361cc6c48b 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2821,9 +2821,10 @@ void LLStartUp::initNameCache()
 
 void LLStartUp::initExperiences()
 {   
-    // just a get instance here.  Should trigger loading the cache.
-    LLExperienceCache::getInstance();
-	LLAppViewer::instance()->loadExperienceCache();
+    // Should trigger loading the cache.
+    LLExperienceCache::getInstance()->setCapabilityQuery(
+        boost::bind(&LLAgent::getRegionCapability, &gAgent, _1));
+
 	LLExperienceLog::instance().initialize();
 }
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 886725be79..4e1a86bb71 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6653,7 +6653,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 			else if(experienceid.notNull())
 			{
 				payload["experience"]=experienceid;
-				LLExperienceCache::get(experienceid, boost::bind(process_script_experience_details, _1, args, payload));
+                LLExperienceCache::getInstance()->get(experienceid, boost::bind(process_script_experience_details, _1, args, payload));
 				return;
 			}