1 files changed, 7 insertions, 39 deletions

diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index ee8b2d79c0..d0cff1464b 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -70,6 +70,7 @@ S32 BORDER_WIDTH = 6;
 const S32 MAX_TEXTURE_SIZE = 512 ; //max upload texture size 512 * 512
 
 std::set<LLSnapshotLivePreview*> LLSnapshotLivePreview::sList;
+LLPointer<LLImageFormatted> LLSnapshotLivePreview::sSaveLocalImage = NULL;
 
 LLSnapshotLivePreview::LLSnapshotLivePreview (const LLSnapshotLivePreview::Params& p) 
 	:	LLView(p),
@@ -131,6 +132,7 @@ LLSnapshotLivePreview::~LLSnapshotLivePreview()
 
 	// 	gIdleCallbacks.deleteFunction( &LLSnapshotLivePreview::onIdle, (void*)this );
 	sList.erase(this);
+	sSaveLocalImage = NULL;
 }
 
 void LLSnapshotLivePreview::setMaxImageSize(S32 size) 
@@ -1065,53 +1067,19 @@ void LLSnapshotLivePreview::saveTexture(BOOL outfit_snapshot, std::string name)
 	mDataSize = 0;
 }
 
-BOOL LLSnapshotLivePreview::saveLocal()
+void LLSnapshotLivePreview::saveLocal(const snapshot_saved_signal_t::slot_type& success_cb, const snapshot_saved_signal_t::slot_type& failure_cb)
 {
     // Update mFormattedImage if necessary
     getFormattedImage();
     
     // Save the formatted image
-	BOOL success = saveLocal(mFormattedImage);
-
-	if(success)
-	{
-		gViewerWindow->playSnapshotAnimAndSound();
-	}
-	return success;
+	saveLocal(mFormattedImage, success_cb, failure_cb);
 }
 
 //Check if failed due to insufficient memory
-BOOL LLSnapshotLivePreview::saveLocal(LLPointer<LLImageFormatted> mFormattedImage)
+void LLSnapshotLivePreview::saveLocal(LLPointer<LLImageFormatted> image, const snapshot_saved_signal_t::slot_type& success_cb, const snapshot_saved_signal_t::slot_type& failure_cb)
 {
-	BOOL insufficient_memory;
-	BOOL success = gViewerWindow->saveImageNumbered(mFormattedImage, FALSE, insufficient_memory);
+	sSaveLocalImage = image;
 
-	if (insufficient_memory)
-	{
-		std::string lastSnapshotDir = LLViewerWindow::getLastSnapshotDir();
-
-#ifdef LL_WINDOWS
-		boost::filesystem::path b_path(utf8str_to_utf16str(lastSnapshotDir));
-#else
-		boost::filesystem::path b_path(lastSnapshotDir);
-#endif
-		boost::filesystem::space_info b_space = boost::filesystem::space(b_path);
-		if (b_space.free < mFormattedImage->getDataSize())
-		{
-			LLSD args;
-			args["PATH"] = lastSnapshotDir;
-
-			std::string needM_bytes_string;
-			LLResMgr::getInstance()->getIntegerString(needM_bytes_string, (mFormattedImage->getDataSize()) >> 10);
-			args["NEED_MEMORY"] = needM_bytes_string;
-
-			std::string freeM_bytes_string;
-			LLResMgr::getInstance()->getIntegerString(freeM_bytes_string, (b_space.free) >> 10);
-			args["FREE_MEMORY"] = freeM_bytes_string;
-
-			LLNotificationsUtil::add("SnapshotToComputerFailed", args);
-			return false;
-		}
-	}
-	return success;
+	gViewerWindow->saveImageNumbered(sSaveLocalImage, FALSE, success_cb, failure_cb);
 }