diff options
| author | Richard Linden <none@none> | 2011-05-02 17:57:52 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-02 17:57:52 -0700 |
| commit | d5faa4f38d338777463b7ad6eb3239041d43fe28 (patch) | |
| tree | d57efbda59c9f677b2245bebc97fec129f3f9fad /indra/llui/lllineeditor.cpp | |
| parent | 9a6f06687e5b467f0c049bfbf88c2131eee11ef3 (diff) | |
| parent | 78d76eb4b01e0bd6db41a67d1573a1b841cbe993 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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; +} |