1 files changed, 7 insertions, 7 deletions

diff --git a/linden/indra/newview/llpreviewtexture.cpp b/linden/indra/newview/llpreviewtexture.cpp
index fe94fa4..0a204dc 100644
--- a/linden/indra/newview/llpreviewtexture.cpp
+++ b/linden/indra/newview/llpreviewtexture.cpp
@@ -240,7 +240,8 @@ void LLPreviewTexture::draw()
 
                         if( mLoadingFullImage )
                         {
-                                LLFontGL::sSansSerif->renderUTF8("Receiving:", 0,
+                                // *TODO: Translate
+                                LLFontGL::sSansSerif->renderUTF8(std::string("Receiving:"), 0,
                                         interior.mLeft + 4, 
                                         interior.mBottom + 4,
                                         LLColor4::white, LLFontGL::LEFT, LLFontGL::BOTTOM,
@@ -276,7 +277,8 @@ void LLPreviewTexture::draw()
                         else
                         if( !mSavedFileTimer.hasExpired() )
                         {
-                                LLFontGL::sSansSerif->renderUTF8("File Saved", 0,
+                                // *TODO: Translate
+                                LLFontGL::sSansSerif->renderUTF8(std::string("File Saved"), 0,
                                         interior.mLeft + 4,
                                         interior.mBottom + 4,
                                         LLColor4::white, LLFontGL::LEFT, LLFontGL::BOTTOM,
@@ -309,9 +311,7 @@ void LLPreviewTexture::saveAs()
                 mLoadingFullImage = TRUE;
                 getWindow()->incBusyCount();
                 mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave, 
-                                                                        0, 
-                                                                        TRUE, 
-                                                                        new LLUUID( mItemUUID ) );
+                                                                   0, TRUE, FALSE, new LLUUID( mItemUUID ) );
         }
 }
 
@@ -349,13 +349,13 @@ void LLPreviewTexture::onFileLoadedForSave(BOOL success,
                 LLPointer<LLImageTGA> image_tga = new LLImageTGA;
                 if( !image_tga->encode( src ) )
                 {
-                        LLStringBase<char>::format_map_t args;
+                        LLStringUtil::format_map_t args;
                         args["[FILE]"] = self->mSaveFileName;
                         gViewerWindow->alertXml("CannotEncodeFile", args);
                 }
                 else if( !image_tga->save( self->mSaveFileName ) )
                 {
-                        LLStringBase<char>::format_map_t args;
+                        LLStringUtil::format_map_t args;
                         args["[FILE]"] = self->mSaveFileName;
                         gViewerWindow->alertXml("CannotWriteFile", args);
                 }