diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-12-10 13:20:10 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-12-10 13:20:10 -0800 |
| commit | 647fe8fb13c02854349fda2113bc9b1902ceca10 (patch) | |
| tree | 662e864d65fe3e0bed4615706121cc8a38e2e8c5 /indra/llui/lltextbase.cpp | |
| parent | 1924f1bbca437eac4ca5d047c489042e65904d2e (diff) | |
| parent | 426744df2c9a6c04bab594fefbd8b35970d0948d (diff) | |
Merge
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 3f213ed13e..49537ef78f 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1005,6 +1005,7 @@ void LLTextBase::draw() if (mBGVisible) { + F32 alpha = getCurrentTransparency(); // clip background rect against extents, if we support scrolling LLRect bg_rect = mVisibleTextRect; if (mScroller) @@ -1016,7 +1017,7 @@ void LLTextBase::draw() : hasFocus() ? mFocusBgColor.get() : mWriteableBgColor.get(); - gl_rect_2d(doc_rect, bg_color, TRUE); + gl_rect_2d(doc_rect, bg_color % alpha, TRUE); } // draw document view |