From 3441d3403f43f718d21f441b3bcf87ae183fdd9d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 4 Mar 2014 14:01:47 -0800
Subject: ACME-1343 : Reset the siz eof the preview texture to be the same as
 the saved snapshot

---
 indra/newview/llsnapshotlivepreview.cpp | 19 ++++++++-----------
 indra/newview/llsnapshotlivepreview.h   |  6 ++++--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index db203c7c78..d6a034ba15 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -621,19 +621,16 @@ LLViewerTexture* LLSnapshotLivePreview::getBigThumbnailImage()
     
 	LLPointer<LLImageRaw> raw = new LLImageRaw;
     
-    // The big thumbnail is be a subsampled version of the preview (used in SL Share previews, i.e. Flickr, Twitter, Facebook)
-    raw->resize( mPreviewImage->getWidth(),
-                mPreviewImage->getHeight(),
-                mPreviewImage->getComponents());
-    raw->copy(mPreviewImage);
-    // Scale to the big thumbnail size
-    if (!raw->scale(getBigThumbnailWidth(), getBigThumbnailHeight()))
-    {
-        raw = NULL ;
-    }
-    
 	if (raw)
 	{
+        // The big thumbnail is a new filtered version of the preview (used in SL Share previews, i.e. Flickr, Twitter, Facebook)
+        mBigThumbnailWidth = mPreviewImage->getWidth();
+        mBigThumbnailHeight = mPreviewImage->getHeight();
+        raw->resize( mBigThumbnailWidth,
+                     mBigThumbnailHeight,
+                     mPreviewImage->getComponents());
+        raw->copy(mPreviewImage);
+    
         // Filter
         // Note: filtering needs to be done *before* the scaling to power of 2 or the effect is distorted
         if (getFilter() != "")
diff --git a/indra/newview/llsnapshotlivepreview.h b/indra/newview/llsnapshotlivepreview.h
index 0e918d165e..7e19f77e26 100644
--- a/indra/newview/llsnapshotlivepreview.h
+++ b/indra/newview/llsnapshotlivepreview.h
@@ -123,8 +123,8 @@ public:
 
     
 	LLViewerTexture* getBigThumbnailImage();
-	S32  getBigThumbnailWidth() const { return 3*mThumbnailWidth ; }
-	S32  getBigThumbnailHeight() const { return 3*mThumbnailHeight ; }
+	S32  getBigThumbnailWidth() const { return mBigThumbnailWidth ; }
+	S32  getBigThumbnailHeight() const { return mBigThumbnailHeight ; }
 
 	// Returns TRUE when snapshot generated, FALSE otherwise.
 	static BOOL onIdle( void* snapshot_preview );
@@ -154,6 +154,8 @@ private:
     BOOL                        mThumbnailSubsampled; // TRUE if the thumbnail is a subsampled version of the mPreviewImage
     
 	LLPointer<LLViewerTexture>	mBigThumbnailImage ;
+    S32                         mBigThumbnailWidth;
+    S32                         mBigThumbnailHeight;
     BOOL                        mBigThumbnailUpToDate;
 
 	S32							mCurImageIndex;
-- 
cgit v1.2.3