diff options
author | dolphin <dolphin@lindenlab.com> | 2013-10-04 09:19:25 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-10-04 09:19:25 -0700 |
commit | c2c060d4401d3a79a9ae0076af0c9b86d14f7f37 (patch) | |
tree | b7efcf3c2e38aa9de488342b3379b4bde0a6bc47 /indra/newview/lltoast.h | |
parent | d44c85c6dc575c0c67019ce1bffecfaa5bc275d1 (diff) | |
parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) |
Merge with 3.6.7
Diffstat (limited to 'indra/newview/lltoast.h')
-rwxr-xr-x | indra/newview/lltoast.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h index ea62f758f8..f02d7c2a1a 100755 --- a/indra/newview/lltoast.h +++ b/indra/newview/lltoast.h @@ -73,6 +73,7 @@ class LLToast : public LLModalDialog, public LLInstanceTracker<LLToast> { friend class LLToastLifeTimer; public: + typedef boost::function<void (LLToast* toast)> toast_callback_t; typedef boost::signals2::signal<void (LLToast* toast)> toast_signal_t; typedef boost::signals2::signal<void (LLToast* toast, bool mouse_enter)> toast_hover_check_signal_t; @@ -105,6 +106,7 @@ public: }; static void updateClass(); + static void cleanupToasts(); LLToast(const LLToast::Params& p); virtual ~LLToast(); |