diff options
| author | Richard Linden <none@none> | 2010-07-16 17:13:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-16 17:13:17 -0700 |
| commit | b36abda510c3d48d95199c0ce810d2cb9c223644 (patch) | |
| tree | f4b21a4f65b53e0ded141ae80e72bcc14ce3b0c8 /indra/llui/lltextbase.h | |
| parent | de65b93f082a680b86b6afed59f028d0bddb0eb6 (diff) | |
| parent | 5eaab96a0b6bcf22db53f2783c0c2716ec872967 (diff) | |
merge
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. |