diff options
author | richard <none@none> | 2009-10-30 17:46:28 -0700 |
---|---|---|
committer | richard <none@none> | 2009-10-30 17:46:28 -0700 |
commit | c964f281906e760c88c4f01edc566df35291ddff (patch) | |
tree | 431bef201d87f3628c9702a5ec73ca8737d198b5 /indra/llui/lltooltip.h | |
parent | 123db56856ef0451e28fe7ac7ce3bcc27d3066f1 (diff) | |
parent | b82bda605d85fe9b1ad69ce36a36de18a2924924 (diff) |
merge
Diffstat (limited to 'indra/llui/lltooltip.h')
-rw-r--r-- | indra/llui/lltooltip.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h index 4a5f60f93d..30d251266c 100644 --- a/indra/llui/lltooltip.h +++ b/indra/llui/lltooltip.h @@ -78,16 +78,13 @@ public: visible_time_far; // time for which tooltip is visible while mouse moved away Optional<LLRect> sticky_rect; Optional<const LLFontGL*> font; - - Optional<click_callback_t> click_callback; Optional<LLUIImage*> image; - - - Optional<bool> time_based_media; - Optional<bool> web_based_media; - Optional<bool> media_playing; - Optional<click_callback_t> click_playmedia_callback; - Optional<click_callback_t> click_homepage_callback; + Optional<bool> time_based_media, + web_based_media, + media_playing; + Optional<click_callback_t> click_callback, + click_playmedia_callback, + click_homepage_callback; Optional<S32> max_width; Optional<S32> padding; Optional<bool> wrap; |