diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-18 10:07:40 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-18 10:07:40 -0400 |
commit | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (patch) | |
tree | 3916874ed180ee9567b4fb76d88d8ce72689c257 /indra/llui/lllineeditor.cpp | |
parent | d534c8009f2573400a21c19b00691536fc3cc23f (diff) | |
parent | b8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff) |
merged from 2.6.4-start tag in viewer-development
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
-rw-r--r-- | indra/llui/lllineeditor.cpp | 5 |
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; +} |