summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-01-18 16:28:24 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-01-18 16:28:24 +0200
commitfe37c59940d81db6f95b842da1b14b67cb9451d6 (patch)
tree50f090ca3e7b0a4126e29cf8fcc3343e8ce588da /indra
parent47d56ae5744b8d26b933fead6139d91ace61e23c (diff)
fixed EXT-4382 “Crash when blocking avatar from the inventory offer dialog”,
added clean-up of stored toasts list on toast destroy event; --HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llscreenchannel.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index 027f3daffb..2eee7635a7 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -250,6 +250,13 @@ void LLScreenChannel::onToastDestroyed(LLToast* toast)
{
mToastList.erase(it);
}
+
+ it = find(mStoredToastList.begin(), mStoredToastList.end(), static_cast<LLPanel*>(toast));
+
+ if(it != mStoredToastList.end())
+ {
+ mStoredToastList.erase(it);
+ }
}