diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-30 14:29:56 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-30 14:29:56 +0200 |
commit | 982ed974efe9483d040789845c1059e2a93d073d (patch) | |
tree | 23689959f1ed002c55b39852b68c4e38073c2eb6 /indra/newview/lltoast.h | |
parent | 0a6f3fadcf97d1055a5cf78ee9917469b22ea094 (diff) | |
parent | 7dd9fb280663dfd0842b69e8c5f706fd96b8cf75 (diff) |
merge
--HG--
branch : product-engine
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; |