diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-11 12:59:26 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-11 12:59:26 +0100 |
| commit | b228915d1f45dc6d2c88a9381957b904410428f8 (patch) | |
| tree | 19146a241fd0d0ac8d42b929728959f7d323101c /indra/llui/lltextbase.cpp | |
| parent | 51f77668153ec3d5b8b7a73beef6f718e65be568 (diff) | |
| parent | c83a0105080981fd78ce3276e85837f8849176be (diff) | |
merge from PE's viewer-public
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()); |