diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:32:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:32:12 -0500 |
| commit | b8a925ec71f2a4483476e363428c5656702b1f19 (patch) | |
| tree | 117c4b884d8fd1e79e8f64184e62ea453d82a990 /indra/newview/llfloatersnapshot.cpp | |
| parent | 23031612745c7f1094a77252b24039333420b8c5 (diff) | |
| parent | 90a365ed2f13612d267a4eed9b54bd1b62edb7d5 (diff) | |
merge fix for STORM-584
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) ; } |