diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-19 13:59:20 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-19 13:59:20 +0300 |
| commit | 4523cee89c924d22513d376d11c6ed76c22ba5bc (patch) | |
| tree | 180ad0b1f550f7df1c2d8e8b0f7050ebdd5abf12 /indra/llui/llstyle.cpp | |
| parent | 1ec9346f6a87074713624ac27f25432532d18409 (diff) | |
| parent | f1c9e56e93329b532a11ff5522dd3bcc5f7bbae1 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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 b8f93b6a0e..d63f67b4c1 100644 --- a/indra/llui/llstyle.cpp +++ b/indra/llui/llstyle.cpp @@ -42,6 +42,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") @@ -49,12 +51,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), |