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/lltextbase.h | |
| parent | 1ec9346f6a87074713624ac27f25432532d18409 (diff) | |
| parent | f1c9e56e93329b532a11ff5522dd3bcc5f7bbae1 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 4b0eeeb7d6..86f0e55a1d 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -241,7 +241,9 @@ public: text_readonly_color, bg_readonly_color, bg_writeable_color, - bg_focus_color; + bg_focus_color, + text_selected_color, + bg_selected_color; Optional<bool> bg_visible, border_visible, @@ -251,7 +253,7 @@ public: plain_text, wrap, use_ellipses, - allow_html, + parse_urls, parse_highlights, clip_partial; @@ -507,6 +509,8 @@ protected: LLUIColor mWriteableBgColor; LLUIColor mReadOnlyBgColor; LLUIColor mFocusBgColor; + LLUIColor mTextSelectedColor; + LLUIColor mSelectedBGColor; // cursor S32 mCursorPos; // I-beam is just after the mCursorPos-th character. |