diff options
| author | Aleric Inglewood | 2010-10-22 00:51:53 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-10-22 00:51:53 +0200 |
| commit | 7c4e01af677907b75694b9c4827d6f3ba56a5e19 (patch) | |
| tree | fd743d3cefc7d4e671c6a6429be50e76191bbd9c /linden/indra/newview/llfilepicker.cpp | |
| parent | Don't dump callstacks at clean exit of viewer. (diff) | |
| parent | Changed version to Experimental 2010.10.17 (diff) | |
| download | meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.zip meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.gz meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.bz2 meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.xz | |
Merge branch 'weekly' of http://github.com/imprudence/imprudence into weekly
Diffstat (limited to 'linden/indra/newview/llfilepicker.cpp')
| -rw-r--r-- | linden/indra/newview/llfilepicker.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp index 40b1abb..a59fa06 100644 --- a/linden/indra/newview/llfilepicker.cpp +++ b/linden/indra/newview/llfilepicker.cpp | |||
| @@ -532,12 +532,16 @@ Boolean LLFilePicker::navOpenFilterProc(AEDesc *theItem, void *info, void *callB | |||
| 532 | { | 532 | { |
| 533 | if (fileInfo.filetype != 'JPEG' && fileInfo.filetype != 'JPG ' && | 533 | if (fileInfo.filetype != 'JPEG' && fileInfo.filetype != 'JPG ' && |
| 534 | fileInfo.filetype != 'BMP ' && fileInfo.filetype != 'TGA ' && | 534 | fileInfo.filetype != 'BMP ' && fileInfo.filetype != 'TGA ' && |
| 535 | fileInfo.filetype != 'TIFF' && fileInfo.filetype != 'PSD ' && | ||
| 535 | fileInfo.filetype != 'BMPf' && fileInfo.filetype != 'TPIC' && | 536 | fileInfo.filetype != 'BMPf' && fileInfo.filetype != 'TPIC' && |
| 536 | fileInfo.filetype != 'PNG ' && | 537 | fileInfo.filetype != 'PNG ' && |
| 537 | (fileInfo.extension && (CFStringCompare(fileInfo.extension, CFSTR("jpeg"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && | 538 | (fileInfo.extension && (CFStringCompare(fileInfo.extension, CFSTR("jpeg"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && |
| 538 | CFStringCompare(fileInfo.extension, CFSTR("jpg"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && | 539 | CFStringCompare(fileInfo.extension, CFSTR("jpg"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && |
| 539 | CFStringCompare(fileInfo.extension, CFSTR("bmp"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && | 540 | CFStringCompare(fileInfo.extension, CFSTR("bmp"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && |
| 540 | CFStringCompare(fileInfo.extension, CFSTR("tga"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && | 541 | CFStringCompare(fileInfo.extension, CFSTR("tga"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && |
| 542 | CFStringCompare(fileInfo.extension, CFSTR("psd"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && | ||
| 543 | CFStringCompare(fileInfo.extension, CFSTR("tiff"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && | ||
| 544 | CFStringCompare(fileInfo.extension, CFSTR("tif"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && | ||
| 541 | CFStringCompare(fileInfo.extension, CFSTR("png"), kCFCompareCaseInsensitive) != kCFCompareEqualTo)) | 545 | CFStringCompare(fileInfo.extension, CFSTR("png"), kCFCompareCaseInsensitive) != kCFCompareEqualTo)) |
| 542 | ) | 546 | ) |
| 543 | { | 547 | { |