diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 16:23:34 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 16:23:34 +0000 |
| commit | f7f73568b5b3d63ffe589aeabad02dcb2a6c671c (patch) | |
| tree | d1dacd5d31dc7f6036919a5ee9f82ec89d7f6513 /indra/newview | |
| parent | d2c2d3f58e8d150c993708cbf13fc584a557ced7 (diff) | |
| parent | fca58b27507c653127bc7063dc5955070e4e297d (diff) | |
merge.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_beacons.xml | 3 |
2 files changed, 6 insertions, 1 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, diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index c8f6c613af..4fc2b698d8 100644 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml @@ -25,7 +25,7 @@ name="label_show" text_color="White" type="string"> - Show: + Show : </text> <check_box control_name="renderbeacons" @@ -117,6 +117,7 @@ <check_box control_name="soundsbeacon" height="16" + left="0" label="Sound sources" layout="topleft" name="sounds" > |