summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersnapshot.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-01 16:23:34 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-01 16:23:34 +0000
commitf7f73568b5b3d63ffe589aeabad02dcb2a6c671c (patch)
treed1dacd5d31dc7f6036919a5ee9f82ec89d7f6513 /indra/newview/llfloatersnapshot.cpp
parentd2c2d3f58e8d150c993708cbf13fc584a557ced7 (diff)
parentfca58b27507c653127bc7063dc5955070e4e297d (diff)
merge.
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
-rw-r--r--indra/newview/llfloatersnapshot.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index a0031f0193..b6e9fb3f6c 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -2084,6 +2084,10 @@ void LLFloaterSnapshot::draw()
S32 offset_x = (getRect().getWidth() - previewp->getThumbnailWidth()) / 2 ;
S32 offset_y = thumbnail_rect.mBottom + (thumbnail_rect.getHeight() - previewp->getThumbnailHeight()) / 2 ;
+ if (! gSavedSettings.getBOOL("AdvanceSnapshot"))
+ {
+ offset_y += getUIWinHeightShort() - getUIWinHeightLong();
+ }
glMatrixMode(GL_MODELVIEW);
gl_draw_scaled_image(offset_x, offset_y,