diff options
| author | angela <angela@lindenlab.com> | 2009-11-17 16:34:06 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-17 16:34:06 +0800 |
| commit | 2217a677104ffadab8815a0886d66ac264e74792 (patch) | |
| tree | 4f4f45bc490756a1a41fb09f39e1cdb50822dc4d /indra/newview/llexpandabletextbox.cpp | |
| parent | ccc72757ef23fa7ffba066e5bdaf05e3f8a95cca (diff) | |
| parent | 0098bf40ea73078e2164ae55a8fa2f9049d0d4e9 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
| -rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 6d7da107ac..bd6936f05c 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -164,7 +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.name(LLFontGL::nameFromFont(expander_style.font)); expander_style.font.style = "UNDERLINE"; expander_style.color = LLUIColorTable::instance().getColor("HTMLLinkColor"); LLExpanderSegment* expanderp = new LLExpanderSegment(new LLStyle(expander_style), getLineStart(last_line), getLength() + 1, mExpanderLabel, *this); |