diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-11 11:14:45 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-11 11:14:45 -0700 |
| commit | 02c86086acceb83fcddad763123b532c70641688 (patch) | |
| tree | a7a220131b5b491d5c0823df1c07ee86a97e2a77 /indra/newview/llfloatersnapshot.cpp | |
| parent | 5748a14f5d7e85230e74c330a7c2b058856be9cd (diff) | |
| parent | 9c94b76ec10cb5a323f5f8c5c1e8340f40c3b175 (diff) | |
Merge with Sabin
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 34dbce67c2..e68d699d03 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -236,7 +236,7 @@ LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) : mImageScaled[0] = FALSE; mImageScaled[1] = FALSE; - mMaxImageSize = MAX_IMAGE_SIZE ; + mMaxImageSize = MAX_SNAPSHOT_IMAGE_SIZE ; mKeepAspectRatio = gSavedSettings.getBOOL("KeepAspectForSnapshot") ; mThumbnailUpdateLock = FALSE ; mThumbnailUpToDate = FALSE ; @@ -255,13 +255,13 @@ LLSnapshotLivePreview::~LLSnapshotLivePreview() void LLSnapshotLivePreview::setMaxImageSize(S32 size) { - if(size < MAX_IMAGE_SIZE) + if(size < MAX_SNAPSHOT_IMAGE_SIZE) { mMaxImageSize = size; } else { - mMaxImageSize = MAX_IMAGE_SIZE ; + mMaxImageSize = MAX_SNAPSHOT_IMAGE_SIZE ; } } |