livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-7343 - removed unusued coprocedure parameter, changed one coro argument to pass by value

master
Brad Payne (Vir Linden) 2017-05-01 15:05:57 -04:00
parent 9dfb5614e6
commit 218615320a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llviewerassetstorage.cpp
View File

@ -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)

6
indra/newview/llviewerassetstorage.h
View File

@ -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);