diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-17 18:52:15 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 18:52:15 -0500 |
| commit | 65ca5968cd59663c3567287c14ce506e37c085c4 (patch) | |
| tree | b74325f43d5757fdab1ce607b4f6aff94529e7b3 /indra/newview/llfilepicker.cpp | |
| parent | 49e28d324066add8cca44e27806b8077d3b0c542 (diff) | |
| parent | cba34d7d4cdb0339113a4798965d595645d5cb49 (diff) | |
Automated merge with file:///Users/oz/Work/viewer-vs2010
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index f0840774bd..51e76bcf9b 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -403,9 +403,9 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename) { wcsncpy( mFilesW,L"untitled.jpeg", FILENAME_BUFFER_SIZE); /*Flawfinder: ignore*/ } - mOFN.lpstrDefExt = L"jpeg"; + mOFN.lpstrDefExt = L"jpg"; mOFN.lpstrFilter = - L"JPEG Images (*.jpeg)\0*.jpeg\0" \ + L"JPEG Images (*.jpg *.jpeg)\0*.jpg;*.jpeg\0" \ L"\0"; break; case FFSAVE_AVI: |