summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-03 07:50:40 -0500
committerOz Linden <oz@lindenlab.com>2011-03-03 07:50:40 -0500
commit856a6992ebb0989e5d143d987a3e9ba79bb6492e (patch)
tree030b791d9b0d0622ab90ef7e19d6d038eaf80260 /indra/newview/llfilepicker.cpp
parent0d93ce2e4a3daabc8d653290e39b67e5cddabb14 (diff)
parentb7c49f0f47f53d200df5afe4a4b68a83dd789918 (diff)
pull latest changes from viewer-vs2010
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: