summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-01-18 18:44:52 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-01-18 18:44:52 +0200
commit17f694ea392dfc535b665b756d8559cd6e4dc6eb (patch)
tree0b96456a5e93f1624c26e9283d16a94803b8c6ba /indra/newview
parent88d9710a8cceaea03c650d0d693e7c59daff3449 (diff)
parent7165bb86be059540139d936e930a8b09556d040a (diff)
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llscreenchannel.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index 2eee7635a7..0adc9fc258 100644
--- 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);