Crashfix: Stop notifications when we're about to exit.

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/newview/llnotificationmanager.cpp b/indra/newview/llnotificationmanager.cpp
index f792f53ac5..3d8150eed3 100644
--- a/indra/newview/llnotificationmanager.cpp
+++ b/indra/newview/llnotificationmanager.cpp
@@ -97,6 +97,13 @@ bool LLNotificationManager::onNotification(const LLSD& notify)
 {
 	LLSysHandler* handle = NULL;
 
+	// Don't bother if we're going down.
+	// Otherwise we might crash when trying to use handlers that are already dead.
+	if( LLApp::isExiting() )
+	{
+		return false;
+	}
+
 	if (LLNotifications::destroyed())
 		return false;