diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-03-28 01:00:34 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-03-28 01:00:34 +0200 |
| commit | a520c01c730b32f4dcdced79e8972376086d30a0 (patch) | |
| tree | a30e24671119e3537a8b7800ce70e3c72c4e7e68 /indra/newview/llviewerassetupload.h | |
| parent | d0f3186cb847dc7ba623255dda40252f82ea20ce (diff) | |
| parent | 328329fceab6b18dd7dda6f7ce9a3d4788fd7c54 (diff) | |
Merge branch 'master' into DRTVWR-501-maint
Diffstat (limited to 'indra/newview/llviewerassetupload.h')
| -rw-r--r-- | indra/newview/llviewerassetupload.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerassetupload.h b/indra/newview/llviewerassetupload.h index ee1806b782..08b03e3059 100644 --- a/indra/newview/llviewerassetupload.h +++ b/indra/newview/llviewerassetupload.h @@ -62,7 +62,6 @@ public: virtual LLSD prepareUpload(); virtual LLSD generatePostBody(); virtual void logPreparedUpload(); - virtual S32 getEconomyUploadCost(); virtual LLUUID finishUpload(LLSD &result); LLTransactionID getTransactionId() const { return mTransactionId; } @@ -88,6 +87,9 @@ 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); + protected: LLResourceUploadInfo( std::string name, |