diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
| commit | 667ca55bad0108c4bdf8f007b89e1a52fc766aad (patch) | |
| tree | 7bd62ac8d9af079c3994565f3f200ccc250bbc28 /indra/newview/llpreviewtexture.cpp | |
| parent | 95f365789f4cebc7bd97ccefd538f14d481a8373 (diff) | |
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
| -rw-r--r-- | indra/newview/llpreviewtexture.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index 79b8313352..fefa6d40d7 100644 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -349,15 +349,15 @@ void LLPreviewTexture::onFileLoadedForSave(BOOL success, LLPointer<LLImageTGA> image_tga = new LLImageTGA; if( !image_tga->encode( src ) ) { - LLStringUtil::format_map_t args; - args["[FILE]"] = self->mSaveFileName; - gViewerWindow->alertXml("CannotEncodeFile", args); + LLSD args; + args["FILE"] = self->mSaveFileName; + LLNotifications::instance().add("CannotEncodeFile", args); } else if( !image_tga->save( self->mSaveFileName ) ) { - LLStringUtil::format_map_t args; - args["[FILE]"] = self->mSaveFileName; - gViewerWindow->alertXml("CannotWriteFile", args); + LLSD args; + args["FILE"] = self->mSaveFileName; + LLNotifications::instance().add("CannotWriteFile", args); } else { @@ -370,7 +370,7 @@ void LLPreviewTexture::onFileLoadedForSave(BOOL success, if( self && !success ) { - gViewerWindow->alertXml("CannotDownloadFile"); + LLNotifications::instance().add("CannotDownloadFile"); } } |