diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-08 10:15:15 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-08 10:15:15 +0100 |
| commit | 4bc6b01e0ef845f3f8d5e7f4c46280c6a753d135 (patch) | |
| tree | 988e79dae01a02ca1877b95a480b2c78c562d220 /indra/llui/lltextbase.cpp | |
| parent | f440dd7a2aa976a3c91290af345d31fa3cb57bfe (diff) | |
| parent | 1856436fb93c7dc45821c1791dbbced26151b2c0 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index d86709c448..72f3a14822 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2743,6 +2743,12 @@ void LLInlineViewSegment::linkToDocument(LLTextBase* editor) editor->addDocumentChild(mView); } +LLLineBreakTextSegment::LLLineBreakTextSegment(S32 pos):LLTextSegment(pos,pos+1) +{ + LLStyleSP s( new LLStyle(LLStyle::Params().visible(true))); + + mFontHeight = llceil(s->getFont()->getLineHeight()); +} LLLineBreakTextSegment::LLLineBreakTextSegment(LLStyleConstSP style,S32 pos):LLTextSegment(pos,pos+1) { mFontHeight = llceil(style->getFont()->getLineHeight()); |