summaryrefslogtreecommitdiff
path: root/indra/llui/lllineeditor.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-08 09:25:36 -0400
committerOz Linden <oz@lindenlab.com>2011-04-08 09:25:36 -0400
commitdf329d14a9b882f1bc9c2c598043569ca2688c03 (patch)
treeceb3606910ffa32c956347f39c708b3cde15e88c /indra/llui/lllineeditor.cpp
parent4895b24e3861021c26a9df3ba9ba04400c63f5c8 (diff)
parented32a5e2b8e865cfad1d697fd5542b05162c40a9 (diff)
pull tags and late fixes back from viewer-pre-beta
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
-rw-r--r--indra/llui/lllineeditor.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 7e348656a9..d99ee5a545 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -2290,3 +2290,8 @@ void LLLineEditor::setContextMenu(LLContextMenu* new_context_menu)
else
mContextMenuHandle.markDead();
}
+
+void LLLineEditor::setFont(const LLFontGL* font)
+{
+ mGLFont = font;
+}