diff options
author | Jacek Antonelli | 2008-08-15 23:44:59 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:59 -0500 |
commit | a408bac29378072fbf36864164149458c978cfcc (patch) | |
tree | 67feccf1a5d3816611ba48d6762f86f0f7f4b1f6 /linden/indra/newview/llviewermenufile.cpp | |
parent | Second Life viewer sources 1.17.0.12 (diff) | |
download | meta-impy-a408bac29378072fbf36864164149458c978cfcc.zip meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.gz meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.bz2 meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.xz |
Second Life viewer sources 1.17.1.0
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewermenufile.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp index 6954b1c..19dfebe 100644 --- a/linden/indra/newview/llviewermenufile.cpp +++ b/linden/indra/newview/llviewermenufile.cpp | |||
@@ -561,6 +561,21 @@ void upload_new_resource(const LLString& src_filename, std::string name, | |||
561 | return; | 561 | return; |
562 | } | 562 | } |
563 | } | 563 | } |
564 | else if( LLString::compareInsensitive(ext.c_str(),".png") == 0 ) | ||
565 | { | ||
566 | asset_type = LLAssetType::AT_TEXTURE; | ||
567 | if (!LLViewerImageList::createUploadFile(src_filename, | ||
568 | filename, | ||
569 | IMG_CODEC_PNG )) | ||
570 | { | ||
571 | sprintf(error_message, "Problem with file %s:\n\n%s\n", | ||
572 | src_filename.c_str(), LLImageBase::getLastError().c_str()); | ||
573 | args["[FILE]"] = src_filename; | ||
574 | args["[ERROR]"] = LLImageBase::getLastError(); | ||
575 | upload_error(error_message, "ProblemWithFile", filename, args); | ||
576 | return; | ||
577 | } | ||
578 | } | ||
564 | else if(LLString::compareInsensitive(ext.c_str(),".wav") == 0) | 579 | else if(LLString::compareInsensitive(ext.c_str(),".wav") == 0) |
565 | { | 580 | { |
566 | asset_type = LLAssetType::AT_SOUND; // tag it as audio | 581 | asset_type = LLAssetType::AT_SOUND; // tag it as audio |