diff options
| author | Logan Dethrow <log@lindenlab.com> | 2012-12-13 18:35:07 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2012-12-13 18:35:07 -0500 |
| commit | 9015344f8e1d246726a8dc4fbfcefb7e74525e6a (patch) | |
| tree | ef17d2dbcc573a3126049e9bc444b78b7507ebc2 /indra/newview/llnotificationmanager.cpp | |
| parent | 3565f6f36db90e1a9a5918d8087f9dc0ab61eb69 (diff) | |
| parent | 18ff702a9965ba8b9a17326b391f8edab01242f6 (diff) | |
Merged SH-3339 work with sunshine-internal. Still a WIP.
Diffstat (limited to 'indra/newview/llnotificationmanager.cpp')
| -rw-r--r-- | indra/newview/llnotificationmanager.cpp | 7 |
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; |