diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:57 -0400 |
| commit | 0c05c8c89632d2747ca8b364ff663d1d5505fb4d (patch) | |
| tree | 9f01f2c772212fcad555176a272265b5b4d67b09 /indra/llui/lllineeditor.cpp | |
| parent | dff83a1ba0592049ccdcd31177c183d62df65e85 (diff) | |
| parent | ee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (diff) | |
merge changes for storm-1117
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; +} |