summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-02-04 15:26:14 -0800
committerMerov Linden <merov@lindenlab.com>2011-02-04 15:26:14 -0800
commita8952915e31c4d29b8b7e731137e6ee373405633 (patch)
tree5eeb04f52129647e25dbbb1552b3226df1363280 /indra/newview
parent422174a804a196d108a656c1043d94ab525d84ec (diff)
parent1651190c802d5ef31b5b23ba49776f764e2ef52b (diff)
STORM-655 : Pull into viewer-development
Diffstat (limited to 'indra/newview')
-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: