diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-30 09:42:04 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-30 09:42:04 -0700 |
| commit | 6324cf82f290e88c3db677e1ced706560d5ca00b (patch) | |
| tree | bb6a8ba8b71a8ee15ab4423b157d18f11ae5b3c5 /indra/newview/lltoast.h | |
| parent | 478f3d075b778740abe12f92c00ad6527545ee6c (diff) | |
| parent | b2526cde2393ca7d84284b254fb4f37b9e8abb5b (diff) | |
Merge hg.aws.productengine.com/secondlife/viewer-2-0/ revs 3836-3849
Diffstat (limited to 'indra/newview/lltoast.h')
| -rw-r--r-- | indra/newview/lltoast.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h index 0698c94880..b670f47045 100644 --- a/indra/newview/lltoast.h +++ b/indra/newview/lltoast.h @@ -63,7 +63,8 @@ public: Optional<LLUUID> notif_id, //notification ID session_id; //im session ID Optional<LLNotificationPtr> notification; - Optional<F32> lifetime_secs; + Optional<F32> lifetime_secs, + fading_time_secs; // Number of seconds while a toast is fading Optional<toast_callback_t> on_delete_toast, on_mouse_enter; Optional<bool> can_fade, @@ -157,6 +158,7 @@ private: // timer counts a lifetime of a toast LLTimer mTimer; F32 mToastLifetime; // in seconds + F32 mToastFadingTime; // in seconds LLPanel* mPanel; LLButton* mHideBtn; |