diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-07-07 19:41:27 +0100 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-07-07 19:41:27 +0100 |
| commit | 247eb0c9c3418c10be8f2a0e3c8116758efa702f (patch) | |
| tree | d3a448c69f1ad241dc72662970d702c2aa618382 /indra/newview/llviewerassetupload.h | |
| parent | d785ec312bb7f4e77517eb44f46f276ba0129677 (diff) | |
Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5
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 38167fc0c7..ad48be67a6 100644 --- a/indra/newview/llviewerassetupload.h +++ b/indra/newview/llviewerassetupload.h @@ -41,7 +41,7 @@ class LLViewerAssetUpload { public: - static void AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter, const LLUUID &id, + static void AssetInventoryUploadCoproc(LLCoros::self &self, LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter, const LLUUID &id, std::string url, NewResourceUploadInfo::ptr_t uploadInfo); private: |