diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-19 12:01:51 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-19 12:01:51 -0800 |
| commit | 62301cb883dd6fadcd5d30acd604f72d2c0b1794 (patch) | |
| tree | baa94e42e64a07351c8e9722c578e94b43a811d8 /indra/newview/llnotificationmanager.cpp | |
| parent | 6036ee9c421154a83a306bc16533e47f9494fd32 (diff) | |
| parent | 185169cbbecebe2a35dbd937d6fb4e0a30fa1832 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
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; |