diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:32:12 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:32:12 -0500 |
commit | b8a925ec71f2a4483476e363428c5656702b1f19 (patch) | |
tree | 117c4b884d8fd1e79e8f64184e62ea453d82a990 /indra/llui/lllineeditor.cpp | |
parent | 23031612745c7f1094a77252b24039333420b8c5 (diff) | |
parent | 90a365ed2f13612d267a4eed9b54bd1b62edb7d5 (diff) |
merge fix for STORM-584
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
-rw-r--r-- | indra/llui/lllineeditor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 3eb58e1aec..ba73b74052 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1530,7 +1530,8 @@ void LLLineEditor::drawBackground() image = mBgImage; } - F32 alpha = getDrawContext().mAlpha; + F32 alpha = getCurrentTransparency(); + // optionally draw programmatic border if (has_focus) { |