summaryrefslogtreecommitdiff
path: root/indra/llui/llpanel.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-07 14:56:36 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-07 14:56:36 -0500
commit6a59861bde42e1b8ddc8c19a0b37a2b0a7011f7a (patch)
tree7a6d04e723a71c33205cdfa9815006d45310657c /indra/llui/llpanel.cpp
parent6a0c02c1b1e6ea3d84f06f2ab58402a98eece462 (diff)
parentd9b4570883652d647c05083c18fac1a088efd6e2 (diff)
Automated merge up from viewer-development
Diffstat (limited to 'indra/llui/llpanel.cpp')
-rw-r--r--indra/llui/llpanel.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 900e2c789e..ff377ba3a1 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -194,6 +194,8 @@ void LLPanel::draw()
// draw background
if( mBgVisible )
{
+ alpha = getCurrentTransparency();
+
LLRect local_rect = getLocalRect();
if (mBgOpaque )
{