diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-11-18 17:15:11 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-11-18 17:15:11 +0000 |
| commit | d12e10be377e692f5164ba914b8f038e66b0d45c (patch) | |
| tree | cad44c4d672f460625f7a30210f41bb801c92cd1 /indra/newview/llviewerassetupload.h | |
| parent | 65550520ed00699098b221a1166e4c1763333d58 (diff) | |
SL-10499 - bulk upload behavior adjusted to account for possibly different upload prices for different asset types. Also added a confirmation dialog for bulk upload.
Diffstat (limited to 'indra/newview/llviewerassetupload.h')
| -rw-r--r-- | indra/newview/llviewerassetupload.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerassetupload.h b/indra/newview/llviewerassetupload.h index 0ba16dce1d..8ef25ad6fd 100644 --- a/indra/newview/llviewerassetupload.h +++ b/indra/newview/llviewerassetupload.h @@ -87,6 +87,8 @@ public: LLUUID getItemId() const { return mItemId; } LLAssetID getAssetId() const { return mAssetId; } + static bool findAssetTypeAndCodecOfExtension(const std::string& exten, LLAssetType::EType& asset_type, U32& codec); + protected: LLResourceUploadInfo( std::string name, |