diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-07-02 09:22:05 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-07-02 09:22:05 -0700 |
| commit | d785ec312bb7f4e77517eb44f46f276ba0129677 (patch) | |
| tree | 9686020c06681328d7150ef6a89d975bd2d418ce /indra/newview/llviewerassetupload.h | |
| parent | f8a7eda55bdd34eeb2fafed21d23d26cd25f924d (diff) | |
| parent | 2a29dbc48295ad24a8a7137a10b9d891debea978 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerassetupload.h')
| -rw-r--r-- | indra/newview/llviewerassetupload.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerassetupload.h b/indra/newview/llviewerassetupload.h index ad48be67a6..38167fc0c7 100644 --- a/indra/newview/llviewerassetupload.h +++ b/indra/newview/llviewerassetupload.h @@ -41,7 +41,7 @@ class LLViewerAssetUpload { public: - static void AssetInventoryUploadCoproc(LLCoros::self &self, LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter, const LLUUID &id, + static void AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter, const LLUUID &id, std::string url, NewResourceUploadInfo::ptr_t uploadInfo); private: |