diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-13 11:57:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-13 11:57:14 -0500 |
| commit | be210914f4e9081f021cc1ad3b671765aba79b61 (patch) | |
| tree | 006e4ec827b8c1b3cf6042c08e12aadf48f43943 /indra/newview/llnotificationmanager.cpp | |
| parent | 7e779a29c142feaa34a30dff39b72d0ae7c0fdc3 (diff) | |
| parent | d8f081cf1b18ddb5f0412b21f4d36bfce6abae19 (diff) | |
merge changes for DRTVWR-238
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; |