summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-02-01 14:22:04 +0000
committerLynx Linden <lynx@lindenlab.com>2010-02-01 14:22:04 +0000
commit11a755507a93cd5ff09f13976bbd984a90740c8b (patch)
treec72484c05a3ce67a3588c089b5957fe6339d08c3 /indra
parent5eee046bb7d62e24df6c35018b3c5383f87ab587 (diff)
parent17b7d606b12aac7b18fe9013e6d8de1c827ac690 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra')
-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,