diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-07 14:56:36 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-07 14:56:36 -0500 |
| commit | 6a59861bde42e1b8ddc8c19a0b37a2b0a7011f7a (patch) | |
| tree | 7a6d04e723a71c33205cdfa9815006d45310657c /indra/llui/lltextbase.cpp | |
| parent | 6a0c02c1b1e6ea3d84f06f2ab58402a98eece462 (diff) | |
| parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) | |
Automated merge up from viewer-development
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 55a1d3ef41..333513d7d7 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 |