diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-04-02 15:04:41 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-04-02 15:04:41 -0700 |
| commit | f684d897f532bcba87cda1f72bd19efac82f6cb6 (patch) | |
| tree | 6222ff28ee7825e987a127383a081297a80d7e6c /indra/newview/llexpandabletextbox.cpp | |
| parent | 4bdecca57ec82a5dbc323432b7b5cb6aba9c1303 (diff) | |
| parent | 90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
| -rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 935dcb74b0..a50184460b 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -150,7 +150,7 @@ void LLExpandableTextBox::LLTextBoxEx::showExpandText() std::pair<S32, S32> visible_lines = getVisibleLines(true); S32 last_line = visible_lines.second - 1; - LLStyle::Params expander_style(getDefaultStyleParams()); + LLStyle::Params expander_style(getStyleParams()); 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); @@ -166,7 +166,7 @@ void LLExpandableTextBox::LLTextBoxEx::hideExpandText() if (mExpanderVisible) { // this will overwrite the expander segment and all text styling with a single style - LLStyleConstSP sp(new LLStyle(getDefaultStyleParams())); + LLStyleConstSP sp(new LLStyle(getStyleParams())); LLNormalTextSegment* segmentp = new LLNormalTextSegment(sp, 0, getLength() + 1, *this); insertSegment(segmentp); |