diff options
| author | maxim@mnikolenko <maxim@mnikolenko> | 2014-01-24 12:12:43 +0200 |
|---|---|---|
| committer | maxim@mnikolenko <maxim@mnikolenko> | 2014-01-24 12:12:43 +0200 |
| commit | 930f407a1c5f3ef573001cefaa5a85d1bb7376b8 (patch) | |
| tree | ce152b41f8964a5140c6e752583066b32d1facfa /indra/newview | |
| parent | ec8bac9c2616e3612d2dffe4d90fef308934347e (diff) | |
MAINT-3642 FIXED Allow saving textures with extension “.tga” at the end of the name.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfilepicker.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfilepicker_mac.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 3064d96434..057acf69b9 100755 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -662,7 +662,7 @@ bool LLFilePicker::doNavSaveDialog(ESaveFilter filter, const std::string& filena case FFSAVE_TGAPNG: type = "PNG"; creator = "prvw"; - extension = "png"; + extension = "png,tga"; break; case FFSAVE_BMP: type = "BMPf"; diff --git a/indra/newview/llfilepicker_mac.mm b/indra/newview/llfilepicker_mac.mm index 13757904e3..1438e4dc0a 100644 --- a/indra/newview/llfilepicker_mac.mm +++ b/indra/newview/llfilepicker_mac.mm @@ -107,7 +107,7 @@ std::string* doSaveDialog(const std::string* file, NSSavePanel *panel = [NSSavePanel savePanel]; NSString *extensionns = [NSString stringWithCString:extension->c_str() encoding:[NSString defaultCStringEncoding]]; - NSArray *fileType = [[NSArray alloc] initWithObjects:extensionns,nil]; + NSArray *fileType = [extensionns componentsSeparatedByString:@","]; //[panel setMessage:@"Save Image File"]; [panel setTreatsFilePackagesAsDirectories: ( flags & F_NAV_SUPPORT ) ]; |