QAR-537 Viewer 1.20 RC 6

merge -r 86279:86925 Branch_1-20-Viewer -> release

1 files changed, 20 insertions, 14 deletions

diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 864c1dd570..9dc3208adb 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -436,25 +436,31 @@ void handle_upload(void* data)
 void handle_compress_image(void*)
 {
 	LLFilePicker& picker = LLFilePicker::instance();
-	if (picker.getOpenFile(LLFilePicker::FFLOAD_IMAGE))
+	if (picker.getMultipleOpenFiles(LLFilePicker::FFLOAD_IMAGE))
 	{
-		std::string infile(picker.getFirstFile());
-		std::string outfile = infile + ".j2c";
+		const char* input_file = picker.getFirstFile();
+		while (input_file)
+		{
+			std::string infile(input_file);
+			std::string outfile = infile + ".j2c";
 
-		llinfos << "Input:  " << infile << llendl;
-		llinfos << "Output: " << outfile << llendl;
+			llinfos << "Input:  " << infile << llendl;
+			llinfos << "Output: " << outfile << llendl;
 
-		BOOL success;
+			BOOL success;
 
-		success = LLViewerImageList::createUploadFile(infile, outfile, IMG_CODEC_TGA);
+			success = LLViewerImageList::createUploadFile(infile, outfile, IMG_CODEC_TGA);
 
-		if (success)
-		{
-			llinfos << "Compression complete" << llendl;
-		}
-		else
-		{
-			llinfos << "Compression failed: " << LLImageBase::getLastError() << llendl;
+			if (success)
+			{
+				llinfos << "Compression complete" << llendl;
+			}
+			else
+			{
+				llinfos << "Compression failed: " << LLImageBase::getLastError() << llendl;
+			}
+
+			input_file = picker.getNextFile();
 		}
 	}
 }