summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-09-26 12:34:19 -0700
committerGraham Linden <graham@lindenlab.com>2013-09-26 12:34:19 -0700
commitdb18ad3b2a368986b2757aab673c3b988cd60575 (patch)
tree3146b60137898eb0892fdd3623417d482ac2937d
parentfb6da3bcae4795022c464ed769a7c477b3f50365 (diff)
parentd623b1dfd5231e8aeb5435a89325cde70c7d7b14 (diff)
Merge lion to get Mac fix
-rwxr-xr-xindra/newview/llfilepicker.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 3fec81b627..9da8e82c49 100755
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -659,9 +659,9 @@ bool LLFilePicker::doNavSaveDialog(ESaveFilter filter, const std::string& filena
extension = "tga";
break;
case FFSAVE_TGAPNG:
- type = 'PNG';
- creator = 'prvw';
- extension = CFSTR(".png");
+ type = "PNG";
+ creator = "prvw";
+ extension = "png";
break;
case FFSAVE_BMP:
type = "BMPf";