summaryrefslogtreecommitdiff
path: root/indra/llui/lllineeditor.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-08 09:24:07 -0400
committerOz Linden <oz@lindenlab.com>2011-04-08 09:24:07 -0400
commit444311d58082ae1277a3628fbe380f7407910f50 (patch)
tree9349d5caf656ac427da037fe6fc4b1f4f387ded1 /indra/llui/lllineeditor.cpp
parenta22e3df7e5570e52abcba4a28103c3d76960a010 (diff)
parentc492bffaa6cd0d9bb05bbc3671c7658b7ba52862 (diff)
pull tags and late fixes back from viewer-pre-release
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;
+}