summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-08-04 15:44:45 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-08-04 15:44:45 -0700
commit6f256e2d57d6814fdb97809405989c54ab148c6b (patch)
tree0584e6231bf80e9919e7bf30caceece94b25deb4 /indra/llui/lltexteditor.cpp
parenta97bcb7c7fd705818b7f36af2c4a915e85ff5604 (diff)
parenteefe3388da83ce3e368af28ba466c27644f156c8 (diff)
Merge with dessie/viewer-release
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
-rw-r--r--indra/llui/lltexteditor.cpp2
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?