aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenufile.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewermenufile.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 5dd760e..d9d8636 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -503,7 +503,7 @@ void handle_compress_image(void*)
503 } 503 }
504 else 504 else
505 { 505 {
506 llinfos << "Compression failed: " << LLImageBase::getLastError() << llendl; 506 llinfos << "Compression failed: " << LLImage::getLastError() << llendl;
507 } 507 }
508 508
509 infile = picker.getNextFile(); 509 infile = picker.getNextFile();
@@ -554,9 +554,9 @@ void upload_new_resource(const std::string& src_filename, std::string name,
554 IMG_CODEC_BMP )) 554 IMG_CODEC_BMP ))
555 { 555 {
556 error_message = llformat( "Problem with file %s:\n\n%s\n", 556 error_message = llformat( "Problem with file %s:\n\n%s\n",
557 src_filename.c_str(), LLImageBase::getLastError().c_str()); 557 src_filename.c_str(), LLImage::getLastError().c_str());
558 args["[FILE]"] = src_filename; 558 args["[FILE]"] = src_filename;
559 args["[ERROR]"] = LLImageBase::getLastError(); 559 args["[ERROR]"] = LLImage::getLastError();
560 upload_error(error_message, "ProblemWithFile", filename, args); 560 upload_error(error_message, "ProblemWithFile", filename, args);
561 return; 561 return;
562 } 562 }
@@ -569,9 +569,9 @@ void upload_new_resource(const std::string& src_filename, std::string name,
569 IMG_CODEC_TGA )) 569 IMG_CODEC_TGA ))
570 { 570 {
571 error_message = llformat("Problem with file %s:\n\n%s\n", 571 error_message = llformat("Problem with file %s:\n\n%s\n",
572 src_filename.c_str(), LLImageBase::getLastError().c_str()); 572 src_filename.c_str(), LLImage::getLastError().c_str());
573 args["[FILE]"] = src_filename; 573 args["[FILE]"] = src_filename;
574 args["[ERROR]"] = LLImageBase::getLastError(); 574 args["[ERROR]"] = LLImage::getLastError();
575 upload_error(error_message, "ProblemWithFile", filename, args); 575 upload_error(error_message, "ProblemWithFile", filename, args);
576 return; 576 return;
577 } 577 }
@@ -584,9 +584,9 @@ void upload_new_resource(const std::string& src_filename, std::string name,
584 IMG_CODEC_JPEG )) 584 IMG_CODEC_JPEG ))
585 { 585 {
586 error_message = llformat("Problem with file %s:\n\n%s\n", 586 error_message = llformat("Problem with file %s:\n\n%s\n",
587 src_filename.c_str(), LLImageBase::getLastError().c_str()); 587 src_filename.c_str(), LLImage::getLastError().c_str());
588 args["[FILE]"] = src_filename; 588 args["[FILE]"] = src_filename;
589 args["[ERROR]"] = LLImageBase::getLastError(); 589 args["[ERROR]"] = LLImage::getLastError();
590 upload_error(error_message, "ProblemWithFile", filename, args); 590 upload_error(error_message, "ProblemWithFile", filename, args);
591 return; 591 return;
592 } 592 }
@@ -599,9 +599,9 @@ void upload_new_resource(const std::string& src_filename, std::string name,
599 IMG_CODEC_PNG )) 599 IMG_CODEC_PNG ))
600 { 600 {
601 error_message = llformat("Problem with file %s:\n\n%s\n", 601 error_message = llformat("Problem with file %s:\n\n%s\n",
602 src_filename.c_str(), LLImageBase::getLastError().c_str()); 602 src_filename.c_str(), LLImage::getLastError().c_str());
603 args["[FILE]"] = src_filename; 603 args["[FILE]"] = src_filename;
604 args["[ERROR]"] = LLImageBase::getLastError(); 604 args["[ERROR]"] = LLImage::getLastError();
605 upload_error(error_message, "ProblemWithFile", filename, args); 605 upload_error(error_message, "ProblemWithFile", filename, args);
606 return; 606 return;
607 } 607 }