diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:07:21 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:07:21 -0400 |
| commit | 5d43bc166d011e911e0492579b2f4f8bf015b48f (patch) | |
| tree | ccc4cda5c2c2c3a5689f4a33dcfda2a896f21b8c /indra/newview/llviewerassetupload.h | |
| parent | a3f2cacf542e1d770698ef6c7e6ea1c0a5cd3368 (diff) | |
| parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) | |
Merge commit 'e7eced3' into release/luau-scripting: whitespace fix.
Diffstat (limited to 'indra/newview/llviewerassetupload.h')
| -rw-r--r-- | indra/newview/llviewerassetupload.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerassetupload.h b/indra/newview/llviewerassetupload.h index 7f7707f5bb..5a07fbf802 100644 --- a/indra/newview/llviewerassetupload.h +++ b/indra/newview/llviewerassetupload.h @@ -90,8 +90,8 @@ public: LLUUID getItemId() const { return mItemId; } LLAssetID getAssetId() const { return mAssetId; } - static bool findAssetTypeOfExtension(const std::string& exten, LLAssetType::EType& asset_type); - static bool findAssetTypeAndCodecOfExtension(const std::string& exten, LLAssetType::EType& asset_type, U32& codec, bool bulk_upload = true); + static bool findAssetTypeOfExtension(const std::string& exten, LLAssetType::EType& asset_type); + static bool findAssetTypeAndCodecOfExtension(const std::string& exten, LLAssetType::EType& asset_type, U32& codec, bool bulk_upload = true); protected: LLResourceUploadInfo( @@ -256,7 +256,7 @@ public: }; LLScriptAssetUpload(LLUUID itemId, std::string buffer, invnUploadFinish_f finish, uploadFailed_f failed); - LLScriptAssetUpload(LLUUID taskId, LLUUID itemId, TargetType_t targetType, + LLScriptAssetUpload(LLUUID taskId, LLUUID itemId, TargetType_t targetType, bool isRunning, LLUUID exerienceId, std::string buffer, taskUploadFinish_f finish, uploadFailed_f failed); virtual LLSD generatePostBody(); |