diff options
author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-19 12:19:11 +0200 |
---|---|---|
committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-19 12:19:11 +0200 |
commit | 58439da4c696f8dd6002e6399e4563cbda251a1e (patch) | |
tree | 261b81d6f3492b020852a03f8b358aabfd040836 /indra/llui/lltooltip.h | |
parent | da2a0cfceb9fbc7c66f23f8820309f36b6629530 (diff) | |
parent | 88cce61b09d225df0bcd8aab9dbd2c5a01ee7e19 (diff) |
Merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lltooltip.h')
-rw-r--r-- | indra/llui/lltooltip.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h index 8c8fdf0a4c..7978b6a583 100644 --- a/indra/llui/lltooltip.h +++ b/indra/llui/lltooltip.h @@ -88,6 +88,7 @@ public: Optional<LLRect> sticky_rect; Optional<const LLFontGL*> font; Optional<LLUIImage*> image; + Optional<LLUIColor> text_color; Optional<bool> time_based_media, web_based_media, media_playing; |