diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:26:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:26:19 -0500 |
| commit | cc65a9dbe2a8570b3f392aacfb3a6ee1d76ee2be (patch) | |
| tree | 9736a496da97c9a190da076f7311280d9864d638 /indra/llui/lltextbase.cpp | |
| parent | c51608633ddfdcf9a053fff37461059398ed4500 (diff) | |
| parent | e1d31a5aca0e1619769735e6902b012bad965805 (diff) | |
merge up to latest beta
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 |