1 files changed, 15 insertions, 14 deletions

diff --git a/linden/indra/newview/llpreviewtexture.cpp b/linden/indra/newview/llpreviewtexture.cpp
index 0a204dc..82331b5 100644
--- a/linden/indra/newview/llpreviewtexture.cpp
+++ b/linden/indra/newview/llpreviewtexture.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -200,7 +200,7 @@ void LLPreviewTexture::draw()
         if (!isMinimized())
         {
                 LLGLSUIDefault gls_ui;
-                LLGLSNoTexture gls_notex;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 
                 const LLRect& border = mClientRect;
                 LLRect interior = mClientRect;
@@ -299,20 +299,21 @@ BOOL LLPreviewTexture::canSaveAs() const
 // virtual
 void LLPreviewTexture::saveAs()
 {
-        if( !mLoadingFullImage )
+        if( mLoadingFullImage ) return;
+
+        LLFilePicker& file_picker = LLFilePicker::instance();
+        const LLViewerInventoryItem* item = getItem() ;
+        if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TGA, item ? LLDir::getScrubbedFileName(item->getName()) : LLStringUtil::null) )
         {
-                LLFilePicker& file_picker = LLFilePicker::instance();
-                if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TGA ) )
-                {
-                        // User canceled save.
-                        return;
-                }
-                mSaveFileName = file_picker.getFirstFile();
-                mLoadingFullImage = TRUE;
-                getWindow()->incBusyCount();
-                mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave, 
-                                                                   0, TRUE, FALSE, new LLUUID( mItemUUID ) );
+                // User canceled or we failed to acquire save file.
+                return;
         }
+        // remember the user-approved/edited file name.
+        mSaveFileName = file_picker.getFirstFile();
+        mLoadingFullImage = TRUE;
+        getWindow()->incBusyCount();
+        mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave, 
+                                                                0, TRUE, FALSE, new LLUUID( mItemUUID ) );
 }