From e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 30 Jul 2009 23:22:41 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170
 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 ->
 viewer-2.0.0-3

---
 indra/newview/lltoast.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/lltoast.cpp')

diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 9144f9c3e0..6f5b25214e 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -104,6 +104,7 @@ bool LLToast::timerHasExpired()
 	if (mTimer.getStarted())
 	{
 		F32 elapsed_time = mTimer.getElapsedTimeF32();
+		// after 4 seconds a toast should start fade
 		if (elapsed_time > 4) 
 		{
 			setBackgroundOpaque(FALSE);
@@ -119,7 +120,7 @@ bool LLToast::timerHasExpired()
 //--------------------------------------------------------------------------
 void LLToast::hide()
 {
-	setVisible(FALSE);			//TODO: store in Chiclet's history
+	setVisible(FALSE);
 	mIsViewed = false;
 	mTimer.stop();
 	mOnFade(this, LLSD());
-- 
cgit v1.2.3