diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:41:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:41:34 -0400 |
| commit | fe99404803c0582f845d0d42c0908b96cd6682fb (patch) | |
| tree | 670291989177f3b408c376f01ab70859751fca04 /indra/llui/lllineeditor.cpp | |
| parent | a84c8e0704e363a9b24f3ee56760178267086793 (diff) | |
| parent | 0c05c8c89632d2747ca8b364ff663d1d5505fb4d (diff) | |
merge changes for storm-1118
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; +} |