diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-17 14:56:33 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 14:56:33 -0500 |
| commit | c1901890576d3b9442846c8890b1724438eab46e (patch) | |
| tree | 7d76da988c79d3b11fc2fc5e51d5f2c0248abaf0 /indra/newview/llfilepicker.cpp | |
| parent | 10cf492ef1730e869389b704345a6604ed363427 (diff) | |
| parent | fb94ad7646b5c8a2eaa65e41b0b8b1679652d956 (diff) | |
merge changes for storm-937
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: |