diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-11 08:06:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-11 08:06:15 -0400 |
| commit | f1be78f7e235bfe9395eed748154d77763d5ea65 (patch) | |
| tree | 878191a30d4b72db659977be8d4fd63086126aac /indra/newview/llviewerassetupload.h | |
| parent | d215de3b7d672dcb5da41600c2b5d0abe2cb82ce (diff) | |
MAINT-5351: Finish messy merge restoring 'selfless' changes.
Diffstat (limited to 'indra/newview/llviewerassetupload.h')
| -rw-r--r-- | indra/newview/llviewerassetupload.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetupload.h b/indra/newview/llviewerassetupload.h index b3957c361e..351c2267b7 100644 --- a/indra/newview/llviewerassetupload.h +++ b/indra/newview/llviewerassetupload.h @@ -193,8 +193,7 @@ class LLViewerAssetUpload { public: - static void AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter, const LLUUID &id, - const LLUUID &id, std::string url, NewResourceUploadInfo::ptr_t uploadInfo); + static void AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter, const LLUUID &id, std::string url, NewResourceUploadInfo::ptr_t uploadInfo); private: static void HandleUploadError(LLCore::HttpStatus status, LLSD &result, NewResourceUploadInfo::ptr_t &uploadInfo); |