summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetstorage.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-04-28 16:10:24 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-04-28 16:10:24 -0400
commit9dfb5614e640b3350d89500b7d7486e2065ed7e2 (patch)
tree26aa40c462e9705fa01c4248e90a02f0c01a6d34 /indra/newview/llviewerassetstorage.cpp
parentb7b8d6e1aedeac1dfdfcc9200024bbcc8e2dacae (diff)
MAINT-7343 - moved asset downloads to use coprocedure pools, which should reduce the size of potential memory spikes
Diffstat (limited to 'indra/newview/llviewerassetstorage.cpp')
-rw-r--r--indra/newview/llviewerassetstorage.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index 9918d226c2..71507b5608 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -40,6 +40,7 @@
#include "lltransfertargetvfile.h"
#include "llviewerassetstats.h"
#include "llcoros.h"
+#include "llcoproceduremanager.h"
#include "lleventcoro.h"
#include "llsdutil.h"
#include "llworld.h"
@@ -398,8 +399,8 @@ void LLViewerAssetStorage::queueRequestHttp(
bool is_temp = false;
LLViewerAssetStatsFF::record_enqueue(atype, with_http, is_temp);
- LLCoros::instance().launch("LLViewerAssetStorage::assetRequestCoro",
- boost::bind(&LLViewerAssetStorage::assetRequestCoro, this, req, uuid, atype, callback, user_data));
+ LLCoprocedureManager::instance().enqueueCoprocedure("AssetStorage","LLViewerAssetStorage::assetRequestCoro",
+ boost::bind(&LLViewerAssetStorage::assetRequestCoro, this, _1, req, uuid, atype, callback, user_data));
}
}
@@ -433,6 +434,7 @@ struct LLScopedIncrement
};
void LLViewerAssetStorage::assetRequestCoro(
+ LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &defaultHttpAdapter, // not used
LLViewerAssetRequest *req,
const LLUUID& uuid,
LLAssetType::EType atype,