diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-02 18:59:35 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-02 18:59:35 +0300 |
| commit | 3b7da511179fd2e2e734a4f3137ac8813a5eebee (patch) | |
| tree | 6642492a8be25cf36de2712d019e31f1681ac9ea /indra/llui/lltexteditor.cpp | |
| parent | 122209c4a61ce00bc6157c7ae0b9311930f4410b (diff) | |
| parent | d1094573117db0a951a7e6159a352b0f4c8a8a24 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 130cda3784..c9474d66b7 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -264,6 +264,8 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p) : mContextMenu(NULL), mShowContextMenu(p.show_context_menu) { + mDefaultFont = p.font; + mSourceID.generate(); //FIXME: use image? |