diff options
Diffstat (limited to 'linden/indra/newview/llviewermenufile.cpp')
-rw-r--r-- | linden/indra/newview/llviewermenufile.cpp | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp index 432fcc5..1981bb9 100644 --- a/linden/indra/newview/llviewermenufile.cpp +++ b/linden/indra/newview/llviewermenufile.cpp | |||
@@ -640,6 +640,38 @@ void upload_new_resource(const std::string& src_filename, std::string name, | |||
640 | return; | 640 | return; |
641 | } | 641 | } |
642 | } | 642 | } |
643 | #ifdef LL_DARWIN | ||
644 | else if(exten == "psd") | ||
645 | { | ||
646 | asset_type = LLAssetType::AT_TEXTURE; | ||
647 | if (!LLViewerImageList::createUploadFile(src_filename, | ||
648 | filename, | ||
649 | IMG_CODEC_PSD )) | ||
650 | { | ||
651 | error_message = llformat("Problem with file %s:\n\n%s\n", | ||
652 | src_filename.c_str(), LLImage::getLastError().c_str()); | ||
653 | args["FILE"] = src_filename; | ||
654 | args["ERROR"] = LLImage::getLastError(); | ||
655 | upload_error(error_message, "ProblemWithFile", filename, args); | ||
656 | return; | ||
657 | } | ||
658 | } | ||
659 | else if(exten == "tif" || exten == "tiff") | ||
660 | { | ||
661 | asset_type = LLAssetType::AT_TEXTURE; | ||
662 | if (!LLViewerImageList::createUploadFile(src_filename, | ||
663 | filename, | ||
664 | IMG_CODEC_TIFF )) | ||
665 | { | ||
666 | error_message = llformat("Problem with file %s:\n\n%s\n", | ||
667 | src_filename.c_str(), LLImage::getLastError().c_str()); | ||
668 | args["FILE"] = src_filename; | ||
669 | args["ERROR"] = LLImage::getLastError(); | ||
670 | upload_error(error_message, "ProblemWithFile", filename, args); | ||
671 | return; | ||
672 | } | ||
673 | } | ||
674 | #endif | ||
643 | else if(exten == "wav") | 675 | else if(exten == "wav") |
644 | { | 676 | { |
645 | asset_type = LLAssetType::AT_SOUND; // tag it as audio | 677 | asset_type = LLAssetType::AT_SOUND; // tag it as audio |