Merge with remote repo

1 files changed, 14 insertions, 4 deletions

diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index eba43d76a6..24824a095c 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -63,6 +63,7 @@ LLToast::LLToast(const LLToast::Params& p)
 	mHideBtnEnabled(p.enable_hide_btn),
 	mHideBtn(NULL),
 	mNotification(p.notification),
+	mIsHidden(false),
 	mHideBtnPressed(false)
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "panel_toast.xml", NULL);
@@ -143,7 +144,8 @@ void LLToast::hide()
 {
 	setVisible(FALSE);
 	mTimer.stop();
-	mOnFadeSignal(this);
+	mIsHidden = true;
+	mOnFadeSignal(this); 
 }
 
 //--------------------------------------------------------------------------
@@ -159,9 +161,7 @@ void LLToast::tick()
 {
 	if(mCanFade)
 	{
-		setVisible(FALSE);
-		mTimer.stop();
-		mOnFadeSignal(this); 
+		hide();
 	}
 }
 
@@ -206,6 +206,16 @@ void LLToast::draw()
 //--------------------------------------------------------------------------
 void LLToast::setVisible(BOOL show)
 {
+	if(mIsHidden)
+	{
+		// this toast is invisible after fade until its ScreenChannel will allow it
+		//
+		// (EXT-1849) according to this bug a toast can be resurrected from
+		// invisible state if it faded during a teleportation
+		// then it fades a second time and causes a crash
+		return;
+	}
+
 	if(show)
 	{
 		setBackgroundOpaque(TRUE);