From 218615320a84fdd2d691c57bc9f26d7742be7e31 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 1 May 2017 15:05:57 -0400
Subject: [PATCH] MAINT-7343 - removed unusued coprocedure parameter, changed
one coro argument to pass by value
---
indra/newview/llviewerassetstorage.cpp | 5 ++---
indra/newview/llviewerassetstorage.h | 6 ++----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index 71507b56085..b9bdc4c06f3 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -400,7 +400,7 @@ void LLViewerAssetStorage::queueRequestHttp(
LLViewerAssetStatsFF::record_enqueue(atype, with_http, is_temp);
LLCoprocedureManager::instance().enqueueCoprocedure("AssetStorage","LLViewerAssetStorage::assetRequestCoro",
- boost::bind(&LLViewerAssetStorage::assetRequestCoro, this, _1, req, uuid, atype, callback, user_data));
+ boost::bind(&LLViewerAssetStorage::assetRequestCoro, this, req, uuid, atype, callback, user_data));
}
}
@@ -434,9 +434,8 @@ struct LLScopedIncrement
};
void LLViewerAssetStorage::assetRequestCoro(
- LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &defaultHttpAdapter, // not used
LLViewerAssetRequest *req,
- const LLUUID& uuid,
+ const LLUUID uuid,
LLAssetType::EType atype,
LLGetAssetCallback callback,
void *user_data)
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h
index a32b3bb7000..50131682e7f 100644
--- a/indra/newview/llviewerassetstorage.h
+++ b/indra/newview/llviewerassetstorage.h
@@ -83,10 +83,8 @@ class LLViewerAssetStorage : public LLAssetStorage
void capsRecvForRegion(const LLUUID& region_id, std::string pumpname);
- void assetRequestCoro(
- LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &defaultHttpAdapter,
- LLViewerAssetRequest *req,
- const LLUUID& uuid,
+ void assetRequestCoro(LLViewerAssetRequest *req,
+ const LLUUID uuid,
LLAssetType::EType atype,
void (*callback) (LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32, LLExtStat),
void *user_data);
--
GitLab