diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:27:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:27:20 -0500 |
| commit | c1dbf70113274d543019778894f3e4017a174d7d (patch) | |
| tree | 13dee618db9156f6a24ec8f580fc60bb834be208 /indra/newview/llfloaterpostcard.cpp | |
| parent | 673b3f0502fdfd4deb6f15b3fc9cba198bd326d9 (diff) | |
| parent | cc65a9dbe2a8570b3f392aacfb3a6ee1d76ee2be (diff) | |
merge fix for STORM-718
Diffstat (limited to 'indra/newview/llfloaterpostcard.cpp')
| -rw-r--r-- | indra/newview/llfloaterpostcard.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpostcard.cpp b/indra/newview/llfloaterpostcard.cpp index 220d33016a..f0c9d52ccd 100644 --- a/indra/newview/llfloaterpostcard.cpp +++ b/indra/newview/llfloaterpostcard.cpp @@ -128,6 +128,8 @@ void LLFloaterPostcard::draw() if(!isMinimized() && mViewerImage.notNull() && mJPEGImage.notNull()) { + // Force the texture to be 100% opaque when the floater is focused. + F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency(); LLRect rect(getRect()); // first set the max extents of our preview @@ -149,7 +151,7 @@ void LLFloaterPostcard::draw() } { gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); - gl_rect_2d(rect, LLColor4(0.f, 0.f, 0.f, 1.f)); + gl_rect_2d(rect, LLColor4(0.f, 0.f, 0.f, 1.f) % alpha); rect.stretch(-1); } { @@ -164,7 +166,7 @@ void LLFloaterPostcard::draw() rect.getWidth(), rect.getHeight(), mViewerImage.get(), - LLColor4::white); + LLColor4::white % alpha); } glMatrixMode(GL_TEXTURE); glPopMatrix(); |