summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-08-23 14:44:46 -0700
committerGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-08-23 14:44:46 -0700
commit19726783cddb0ac3d34a510c083976e6f9661b49 (patch)
tree5e10d7178d88936475984ce7f5f109631fb2ea3a /indra/newview
parent2b634d6c45d61f7132fc124e559347a736c6dfda (diff)
MAINT-3046 make LLNotifications clear out vecs of LLNotificationChannelPtr so singleton cleanup doesn't do things it really ought not do
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llappviewer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 1874cba4a4..75595f502f 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1614,6 +1614,8 @@ bool LLAppViewer::cleanup()
//ditch LLVOAvatarSelf instance
gAgentAvatarp = NULL;
+ LLNotifications::instance().clear();
+
// workaround for DEV-35406 crash on shutdown
LLEventPumps::instance().reset();