From 4dabd9c0472deb49573fdafef2fa413e59703f19 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 2 Mar 2007 21:25:50 +0000 Subject: merge release@58699 beta-1-14-0@58707 -> release --- indra/newview/llfilepicker.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'indra/newview/llfilepicker.cpp') diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 98bbf23502..2b2a9fa859 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -345,6 +345,16 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename) mOFN.lpstrFilter = RAW_FILTER \ L"\0"; break; + case FFSAVE_J2C: + if (!filename) + { + wcsncpy( mFilesW,L"untitled.j2c", FILENAME_BUFFER_SIZE); + } + mOFN.lpstrDefExt = L"j2c"; + mOFN.lpstrFilter = + L"Compressed Images (*.j2c)\0*.j2c\0" \ + L"\0"; + break; default: return FALSE; } @@ -660,6 +670,12 @@ OSStatus LLFilePicker::doNavSaveDialog(ESaveFilter filter, const char* filename) extension = CFSTR(".raw"); break; + case FFSAVE_J2C: + type = '\?\?\?\?'; + creator = 'prvw'; + extension = CFSTR(".j2c"); + break; + case FFSAVE_ALL: default: type = '\?\?\?\?'; @@ -1063,6 +1079,10 @@ BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const char* filename ) caption += "RAW File (*.raw)"; suggest_ext += ".raw"; break; + case FFSAVE_J2C: + caption += "Compressed Images (*.j2c)"; + suggest_ext += ".j2c"; + break; default:; break; } -- cgit v1.2.3