diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-08 12:46:43 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-08 12:46:43 -0500 |
| commit | bfbd8e22cb11277f3c43be8f8d9cb0ffa9451a76 (patch) | |
| tree | be43691b4f2cad4c55e134370ac15a8179fdd687 /indra/newview/llfilepicker.cpp | |
| parent | 8b15ca8d6b9cf516670e66ee57591e79b898394d (diff) | |
| parent | 09b009fc23e75c8403cc9879f7f839d9e2656c02 (diff) | |
Automated merge up from viewer-development into mesh-development
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 f209950cfa..8c0ed29855 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -420,9 +420,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: |