Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/

--HG-- branch : product-engine
2010-01-18 18:44:52 +02:00 · 2010-01-18 18:44:52 +02:00 · 17f694ea39
parent 88d9710a8c 7165bb86be
commit 17f694ea39
1 changed files with 5 additions and 0 deletions
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@ -286,6 +286,11 @@ void LLScreenChannel::onToastFade(LLToast* toast)
 //--------------------------------------------------------------------------
 void LLScreenChannel::deleteToast(LLToast* toast)
 {
+	if (toast->isDead())
+	{
+		return;
+	}
+
 	// send signal to observers about destroying of a toast
 	toast->mOnDeleteToastSignal(toast);