From 2b61394234b08ace6baa5d3ca70430d665450dfc Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 3 Oct 2013 13:20:47 -0400 Subject: [PATCH] Fix /singularity/singularity-master/indra/plugins/filepicker/llfilepicker.cpp:762:61: warning: multi-character character constant OSTypes are four byte sequences, therefore we should use 'JP2 ' instead of 'JP2' --- indra/plugins/filepicker/llfilepicker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/plugins/filepicker/llfilepicker.cpp b/indra/plugins/filepicker/llfilepicker.cpp index 7f634edef..3d6803a9c 100644 --- a/indra/plugins/filepicker/llfilepicker.cpp +++ b/indra/plugins/filepicker/llfilepicker.cpp @@ -759,7 +759,7 @@ Boolean LLFilePickerBase::navOpenFilterProc(AEDesc *theItem, void *info, void *c if (fileInfo.filetype != 'JPEG' && fileInfo.filetype != 'JPG ' && fileInfo.filetype != 'BMP ' && fileInfo.filetype != 'TGA ' && fileInfo.filetype != 'BMPf' && fileInfo.filetype != 'TPIC' && - fileInfo.filetype != 'PNG ' && fileInfo.filetype != 'JP2' && + fileInfo.filetype != 'PNG ' && fileInfo.filetype != 'JP2 ' && (fileInfo.extension && (CFStringCompare(fileInfo.extension, CFSTR("jpeg"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && CFStringCompare(fileInfo.extension, CFSTR("jpg"), kCFCompareCaseInsensitive) != kCFCompareEqualTo && CFStringCompare(fileInfo.extension, CFSTR("bmp"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&