diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-03 07:06:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-03 07:06:04 -0500 |
| commit | 67c01ab1fb1bfcb03c304946ccb2375f405187bf (patch) | |
| tree | ddb6bfd70f44aea70ccb33af4ec804319300f9a5 /indra/llui/lltextbase.cpp | |
| parent | 039c0466f9759d7b966d8faf60945b3924d017a8 (diff) | |
| parent | b8a925ec71f2a4483476e363428c5656702b1f19 (diff) | |
merge up to new beta 1 candidate
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 |