diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-11-19 16:15:19 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-11-19 16:15:19 +0000 |
| commit | eb6e64ec401382fd2fbbbb27830e828035a6e5af (patch) | |
| tree | 90983b525d9b7af423644ed5267a04f397828df3 /indra/newview/llviewerassetupload.cpp | |
| parent | 5b20fca991c109df40b5e8ee0f750507c57f46a1 (diff) | |
SL-10499 - Fixes for benefits info and upload, especially bulk upload
Diffstat (limited to 'indra/newview/llviewerassetupload.cpp')
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index de35f9911c..4cbb88d4f1 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -306,6 +306,12 @@ std::string LLResourceUploadInfo::getDisplayName() const return (mName.empty()) ? mAssetId.asString() : mName; }; +bool LLResourceUploadInfo::findAssetTypeOfExtension(const std::string& exten, LLAssetType::EType& asset_type) +{ + U32 codec; + return findAssetTypeAndCodecOfExtension(exten, asset_type, codec); +} + // static bool LLResourceUploadInfo::findAssetTypeAndCodecOfExtension(const std::string& exten, LLAssetType::EType& asset_type, U32& codec) { |