summaryrefslogtreecommitdiff
path: root/indra/llui/lllineeditor.cpp
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-12-21 10:33:58 -0800
committerAndrew A. de Laix <alain@lindenlab.com>2010-12-21 10:33:58 -0800
commite1b198a36b051051941c61d0a558766591ed4cfc (patch)
tree1809bf28779ab1f9b0cd05c97f94af3b7dfa5532 /indra/llui/lllineeditor.cpp
parentfdd5348f81d51363a1639de8b3cc4414fc0f4982 (diff)
parent9c97a200bebe310f91c9ab181fbe337eeab30aaa (diff)
Merge from trunk
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();