From 26940eb2ffcc91d5fd1a825a9638d0f8fff2b9ae Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 16 Jun 2011 23:53:41 +0300
Subject: STORM-1352 WIP Attempting to fix a crash in
LLNearbyChatScreenChannel::showToastsBottom().
Apparently, a nearby chat toast got somehow destroyed while still remaining in the list of active toasts.
Attempt to sort active toasts in showToastsBottom() then triggered the crash.
I don't know how to reproduce the crash, i.e. force destroying a toast in a way that its onClose() method (which would remove references to the toast) isn't called.
So we'll just remove references to the toast whenever it's destroyed.
---
indra/newview/llnearbychathandler.cpp | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'indra')
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index 11dc496311..ae44c76038 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -268,6 +268,9 @@ bool LLNearbyChatScreenChannel::createPoolToast()
toast->setOnFadeCallback(boost::bind(&LLNearbyChatScreenChannel::onToastFade, this, _1));
+ // If the toast gets somehow prematurely destroyed, deactivate it to prevent crash (STORM-1352).
+ toast->setOnToastDestroyedCallback(boost::bind(&LLNearbyChatScreenChannel::onToastDestroyed, this, _1, false));
+
LL_DEBUGS("NearbyChat") << "Creating and pooling toast" << llendl;
m_toast_pool.push_back(toast->getHandle());
return true;
@@ -371,6 +374,8 @@ void LLNearbyChatScreenChannel::arrangeToasts()
int sort_toasts_predicate(LLHandle<LLToast> first, LLHandle<LLToast> second)
{
+ if (!first.get() || !second.get()) return 0; // STORM-1352
+
F32 v1 = first.get()->getTimeLeftToLive();
F32 v2 = second.get()->getTimeLeftToLive();
return v1 > v2;
--
cgit v1.2.3