summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-02-08 15:54:52 -0600
committerDave Parks <davep@lindenlab.com>2011-02-08 15:54:52 -0600
commitebf0dd4dce6d2c3f9f7415f548bca3da217821f8 (patch)
treeb835ff9a36df7864816802f53a19b7d147c204ae /indra/newview/llfilepicker.cpp
parenta242129b571daa8c6137c79931e31f9d43422abc (diff)
parentbfbd8e22cb11277f3c43be8f8d9cb0ffa9451a76 (diff)
Merge
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 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: