diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-07-12 12:52:31 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-07-12 12:52:31 +0300 |
| commit | ea35754f08a9a76208d1edd80ed6bc55278eb575 (patch) | |
| tree | 1ceada3b919f4bf8dfa8e1dc048baadf87784795 /indra/llui/lltexteditor.cpp | |
| parent | d8e26b7b73b734e1745795788c844f6aab3360fe (diff) | |
| parent | ee50934d886b07c85e3be0515ff3e53625052faa (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, 0 insertions, 2 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index c9474d66b7..130cda3784 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -264,8 +264,6 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p) : mContextMenu(NULL), mShowContextMenu(p.show_context_menu) { - mDefaultFont = p.font; - mSourceID.generate(); //FIXME: use image? |