summaryrefslogtreecommitdiff
path: root/indra/newview/llsnapshotlivepreview.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-03-04 14:01:47 -0800
committerMerov Linden <merov@lindenlab.com>2014-03-04 14:01:47 -0800
commit3441d3403f43f718d21f441b3bcf87ae183fdd9d (patch)
tree0ac65118fcdd67e8f1e4a12143e8f2e17688263b /indra/newview/llsnapshotlivepreview.cpp
parent013d72cc90d5c038f9cffca28dbd0660a4e05c22 (diff)
ACME-1343 : Reset the siz eof the preview texture to be the same as the saved snapshot
Diffstat (limited to 'indra/newview/llsnapshotlivepreview.cpp')
-rw-r--r--indra/newview/llsnapshotlivepreview.cpp19
1 files changed, 8 insertions, 11 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() != "")