diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-03 07:06:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-03 07:06:04 -0500 |
| commit | 67c01ab1fb1bfcb03c304946ccb2375f405187bf (patch) | |
| tree | ddb6bfd70f44aea70ccb33af4ec804319300f9a5 /indra/newview/llfloatersnapshot.cpp | |
| parent | 039c0466f9759d7b966d8faf60945b3924d017a8 (diff) | |
| parent | b8a925ec71f2a4483476e363428c5656702b1f19 (diff) | |
merge up to new beta 1 candidate
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index d55272c558..cad54cd158 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -2184,9 +2184,11 @@ void LLFloaterSnapshot::draw() S32 offset_y = thumbnail_rect.mBottom + (thumbnail_rect.getHeight() - previewp->getThumbnailHeight()) / 2 ; glMatrixMode(GL_MODELVIEW); + // Apply floater transparency to the texture unless the floater is focused. + F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency(); gl_draw_scaled_image(offset_x, offset_y, previewp->getThumbnailWidth(), previewp->getThumbnailHeight(), - previewp->getThumbnailImage(), LLColor4::white); + previewp->getThumbnailImage(), LLColor4::white % alpha); previewp->drawPreviewRect(offset_x, offset_y) ; } |