summaryrefslogtreecommitdiff
path: root/indra/llui/lllineeditor.cpp
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-12-09 16:48:07 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-12-09 16:48:07 -0800
commit95445fb1b56a60145933db0891133230c87274b8 (patch)
treef9b03971e89800c68b4c4430b13c90af6cba51e7 /indra/llui/lllineeditor.cpp
parent089665ce4eab97d0ab58e08914f852219ed3fae7 (diff)
parentcf6147f7c092e6ca10697dea341099c5e281df00 (diff)
Merge with viewer-development.
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
-rw-r--r--indra/llui/lllineeditor.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index ba73b74052..aed391c780 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -1529,6 +1529,8 @@ void LLLineEditor::drawBackground()
{
image = mBgImage;
}
+
+ if (!image) return;
F32 alpha = getCurrentTransparency();