diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-25 15:58:08 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-25 15:58:08 +0100 |
| commit | 1d89a80ba7293309fd4fbdd03b802c5c2998aac7 (patch) | |
| tree | 70eb3619b9a3df35687836d9daa328eb52ba85ab /indra/llui/llstyle.cpp | |
| parent | 6fcde580c3a2e6cc62bfab52bd47cae8726c56d4 (diff) | |
| parent | e416840f85dc4a367894036b9fe483f17d959c54 (diff) | |
merge
Diffstat (limited to 'indra/llui/llstyle.cpp')
| -rw-r--r-- | indra/llui/llstyle.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp index 93314d7bc0..5e09cee78b 100644 --- a/indra/llui/llstyle.cpp +++ b/indra/llui/llstyle.cpp @@ -36,6 +36,8 @@ LLStyle::Params::Params() : visible("visible", true), drop_shadow("drop_shadow", LLFontGL::NO_SHADOW), color("color", LLColor4::black), + readonly_color("readonly_color", LLColor4::black), + selected_color("selected_color", LLColor4::black), font("font", LLFontGL::getFontMonospace()), image("image"), link_href("href") @@ -43,12 +45,10 @@ LLStyle::Params::Params() LLStyle::LLStyle(const LLStyle::Params& p) -: mItalic(FALSE), - mBold(FALSE), - mUnderline(FALSE), - mVisible(p.visible), - mColor(p.color()), - mReadOnlyColor(p.readonly_color()), +: mVisible(p.visible), + mColor(p.color), + mReadOnlyColor(p.readonly_color), + mSelectedColor(p.selected_color), mFont(p.font()), mLink(p.link_href), mDropShadow(p.drop_shadow), |