diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 18:35:38 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 18:35:38 +0000 |
| commit | 939e48d38cf9f15e1f7220cc3860810badd8a778 (patch) | |
| tree | e7135ea43d8945c173c5cade2c3767193fa76f56 /indra/newview/llexpandabletextbox.cpp | |
| parent | a402f4894d72209f9ac9bc9d7962c28b3c26bb18 (diff) | |
| parent | 6253e2611d3ecf4ff5c778d0e53f34aed06f35da (diff) | |
merge.
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); |