summaryrefslogtreecommitdiff
path: root/indra/llui/lllineeditor.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2010-12-17 15:54:00 -0500
committerMonty Brandenberg <monty@lindenlab.com>2010-12-17 15:54:00 -0500
commitdb11a76d519ebb076ec0b72284993d7f6c15f383 (patch)
tree2fa7986e0e0ba9a39b2d2d3722ce1769ce6c2684 /indra/llui/lllineeditor.cpp
parent3c05ebd28635e867f9726062b08cdbf4a7b53b22 (diff)
parentfb8ba15801f0620699fecdf2ed08668df0be7210 (diff)
Merge from viewer-development post 2.4 release
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();