diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-08 17:36:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-08 17:36:13 -0400 |
| commit | 5dea0bb37c2c4e58cc5535f5c02fed6ad555f02a (patch) | |
| tree | 5ff27055ef071fd080aa29ea1e60058da12742cf /indra/llui/lllineeditor.cpp | |
| parent | 67aba3395d46a9b88f9d5dc758a27a7d8e542c16 (diff) | |
| parent | 51b75b883269a0a78a9428a690324c17abf028c1 (diff) | |
merge changes for viewer-social-2
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; +} |