diff options
author | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-18 03:15:30 +0800 |
---|---|---|
committer | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-18 03:15:30 +0800 |
commit | 2365dbcd459b37942ddacbcb7010232113a126c1 (patch) | |
tree | a1d02f23ce30af86f5c202aa440b1d5a15fdfedc /indra/llui/lltooltip.h | |
parent | d6bbc652def68b5b8b67ef4049a1250aefdde7cb (diff) | |
parent | 6253e2611d3ecf4ff5c778d0e53f34aed06f35da (diff) |
merge
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; |