diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-05 20:26:26 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-05 20:26:26 -0800 |
| commit | 42a60e6ca5f4179738fa9a7376d1e842bc058ac4 (patch) | |
| tree | 8e1f74ebf472a2ea9ae74f4ea65409c418555218 /indra/llui/llfolderviewitem.h | |
| parent | 3a49beed0e96a797a6d663bcae5e932437ca3661 (diff) | |
| parent | 32d7131b1034d03fa9d3fdde8b86ee9880bb4f67 (diff) | |
Pull merge from dev repo
Diffstat (limited to 'indra/llui/llfolderviewitem.h')
| -rwxr-xr-x | indra/llui/llfolderviewitem.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h index 2e633a39e5..f33f21c8f8 100755 --- a/indra/llui/llfolderviewitem.h +++ b/indra/llui/llfolderviewitem.h @@ -61,6 +61,9 @@ public: Optional<time_t> creation_date; Optional<bool> allow_open; + Optional<LLUIColor> font_color; + Optional<LLUIColor> font_highlight_color; + Optional<S32> left_pad, icon_pad, icon_width, @@ -116,19 +119,20 @@ protected: mIsMouseOverTitle, mAllowOpen, mSelectPending; + + LLUIColor mFontColor; + LLUIColor mFontHighlightColor; // For now assuming all colors are the same in derived classes. + static bool sColorSetInitialized; static LLUIColor sFgColor; static LLUIColor sFgDisabledColor; static LLUIColor sHighlightBgColor; - static LLUIColor sHighlightFgColor; static LLUIColor sFocusOutlineColor; static LLUIColor sMouseOverColor; static LLUIColor sFilterBGColor; static LLUIColor sFilterTextColor; static LLUIColor sSuffixColor; - static LLUIColor sLibraryColor; - static LLUIColor sLinkColor; static LLUIColor sSearchStatusColor; // this is an internal method used for adding items to folders. A |