summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-02-24 17:42:16 -0800
committerDave SIMmONs <simon@lindenlab.com>2011-02-24 17:42:16 -0800
commit52ae219d502d182a7e6c000070e5935b923f30e7 (patch)
tree556151d5097feb5ae079786044188cb0d0400d16 /indra/newview/llfilepicker.cpp
parent1c8c28a8de73228c06fdf2d84045433c7231cd19 (diff)
parent609c70eb5a48389bef1ad33358774764ee9615e2 (diff)
Merge again lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
-rw-r--r--indra/newview/llfilepicker.cpp4
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: