Pull merge from lindenlab/viewer-release

1 files changed, 0 insertions, 30 deletions

diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index dc99dfcb6d..a1965af4a5 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -54,7 +54,6 @@
 #include "llviewerstats.h"
 #include "llvfile.h"
 #include "llvfs.h"
-#include "llwebsharing.h"
 #include "llwindow.h"
 #include "llworld.h"
 
@@ -1029,32 +1028,3 @@ BOOL LLSnapshotLivePreview::saveLocal()
 	return success;
 }
 
-void LLSnapshotLivePreview::saveWeb()
-{
-    // Update mFormattedImage if necessary
-    getFormattedImage();
-    
-	// *FIX: Will break if the window closes because of CloseSnapshotOnKeep!
-	// Needs to pass on ownership of the image.
-	LLImageJPEG* jpg = dynamic_cast<LLImageJPEG*>(mFormattedImage.get());
-	if(!jpg)
-	{
-		LL_WARNS() << "Formatted image not a JPEG" << LL_ENDL;
-		return;
-	}
-
-	LLSD metadata;
-	metadata["description"] = getChild<LLLineEditor>("description")->getText();
-
-	LLLandmarkActions::getRegionNameAndCoordsFromPosGlobal(gAgentCamera.getCameraPositionGlobal(),
-		boost::bind(&LLSnapshotLivePreview::regionNameCallback, this, jpg, metadata, _1, _2, _3, _4));
-
-	gViewerWindow->playSnapshotAnimAndSound();
-}
-
-void LLSnapshotLivePreview::regionNameCallback(LLImageJPEG* snapshot, LLSD& metadata, const std::string& name, S32 x, S32 y, S32 z)
-{
-	metadata["slurl"] = LLSLURL(name, LLVector3d(x, y, z)).getSLURLString();
-
-	LLWebSharing::instance().shareSnapshot(snapshot, metadata);
-}