aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatersnapshot.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-05-24 02:59:24 -0500
committerJacek Antonelli2009-05-24 02:59:40 -0500
commitb2627d927f1642bea84b92adfccd9403676e1341 (patch)
tree07f069e63cfa633b9bd0d07b4eecc229ef67f974 /linden/indra/newview/llfloatersnapshot.cpp
parentSecond Life viewer sources 1.23.1-RC (diff)
downloadmeta-impy-b2627d927f1642bea84b92adfccd9403676e1341.zip
meta-impy-b2627d927f1642bea84b92adfccd9403676e1341.tar.gz
meta-impy-b2627d927f1642bea84b92adfccd9403676e1341.tar.bz2
meta-impy-b2627d927f1642bea84b92adfccd9403676e1341.tar.xz
Second Life viewer sources 1.23.2-RC
Diffstat (limited to 'linden/indra/newview/llfloatersnapshot.cpp')
-rw-r--r--linden/indra/newview/llfloatersnapshot.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 41eeb88..569f575 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -236,7 +236,7 @@ LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) :
236 mImageScaled[0] = FALSE; 236 mImageScaled[0] = FALSE;
237 mImageScaled[1] = FALSE; 237 mImageScaled[1] = FALSE;
238 238
239 mMaxImageSize = MAX_IMAGE_SIZE ; 239 mMaxImageSize = MAX_SNAPSHOT_IMAGE_SIZE ;
240 mKeepAspectRatio = gSavedSettings.getBOOL("KeepAspectForSnapshot") ; 240 mKeepAspectRatio = gSavedSettings.getBOOL("KeepAspectForSnapshot") ;
241 mThumbnailUpdateLock = FALSE ; 241 mThumbnailUpdateLock = FALSE ;
242 mThumbnailUpToDate = FALSE ; 242 mThumbnailUpToDate = FALSE ;
@@ -255,13 +255,13 @@ LLSnapshotLivePreview::~LLSnapshotLivePreview()
255 255
256void LLSnapshotLivePreview::setMaxImageSize(S32 size) 256void LLSnapshotLivePreview::setMaxImageSize(S32 size)
257{ 257{
258 if(size < MAX_IMAGE_SIZE) 258 if(size < MAX_SNAPSHOT_IMAGE_SIZE)
259 { 259 {
260 mMaxImageSize = size; 260 mMaxImageSize = size;
261 } 261 }
262 else 262 else
263 { 263 {
264 mMaxImageSize = MAX_IMAGE_SIZE ; 264 mMaxImageSize = MAX_SNAPSHOT_IMAGE_SIZE ;
265 } 265 }
266} 266}
267 267