diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-12-10 15:24:08 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-12-10 15:24:08 -0500 |
| commit | 623a06aabd9d7e5c7e74211360aa233ec33e4977 (patch) | |
| tree | 21c815db542e45fc07473cd26a24561c5f27add8 /indra/newview/llnotificationmanager.cpp | |
| parent | d56a98dea4c7523a759bea4740d8bdde1df15e30 (diff) | |
| parent | a9ada0cc6a1418da0908f995b1369912a270b22d (diff) | |
merge release tag
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; |