summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-05-01 15:05:57 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-05-01 15:05:57 -0400
commit218615320a84fdd2d691c57bc9f26d7742be7e31 (patch)
tree9f929b74c44ff04fecf3d022294a93cc5549bcce
parent9dfb5614e640b3350d89500b7d7486e2065ed7e2 (diff)
MAINT-7343 - removed unusued coprocedure parameter, changed one coro argument to pass by value
-rw-r--r--indra/newview/llviewerassetstorage.cpp5
-rw-r--r--indra/newview/llviewerassetstorage.h6
2 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index 71507b5608..b9bdc4c06f 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 a32b3bb700..50131682e7 100644
--- a/indra/newview/llviewerassetstorage.h
+++ b/indra/newview/llviewerassetstorage.h
@@ -83,10 +83,8 @@ protected:
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);