summaryrefslogtreecommitdiff
path: root/indra/newview/llexpandabletextbox.cpp
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-16 20:46:40 +0800
committerangela <angela@lindenlab.com>2009-11-16 20:46:40 +0800
commit1baf1d218644ac5dc00d9b41119a1ef168c709a2 (patch)
tree1ddea72957ea597b655c51d144bc83cfbb32d774 /indra/newview/llexpandabletextbox.cpp
parent6b47e36b159a0e036beb442b82b1356aa756f152 (diff)
fix chat format for /me
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
-rw-r--r--indra/newview/llexpandabletextbox.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp
index 6d7da107ac..27df6be730 100644
--- a/indra/newview/llexpandabletextbox.cpp
+++ b/indra/newview/llexpandabletextbox.cpp
@@ -80,7 +80,7 @@ public:
draw_rect.mRight, draw_rect.mTop,
mStyle->getColor(),
LLFontGL::RIGHT, LLFontGL::TOP,
- 0,
+ mStyle->getFontStyle(),
mStyle->getShadowType(),
end - start, draw_rect.getWidth(),
&right_x,
@@ -164,8 +164,7 @@ void LLExpandableTextBox::LLTextBoxEx::showExpandText()
S32 last_line = visible_lines.second - 1;
LLStyle::Params expander_style = getDefaultStyle();
- expander_style.font.name.setIfNotProvided(LLFontGL::nameFromFont(expander_style.font));
- expander_style.font.style = "UNDERLINE";
+ expander_style.underline = true;
expander_style.color = LLUIColorTable::instance().getColor("HTMLLinkColor");
LLExpanderSegment* expanderp = new LLExpanderSegment(new LLStyle(expander_style), getLineStart(last_line), getLength() + 1, mExpanderLabel, *this);
insertSegment(expanderp);