summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-03-15 18:16:44 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-03-15 18:16:44 -0700
commit0a0ba068bf5bc6d829440a12946174c6ed961843 (patch)
tree6bab3721e11bdee90e756bd100259dae6b6d9a78 /indra
parent780fe4e37fe5df4120ef4de09e6fc69f6184e4d3 (diff)
CHUI-852 ([crashhunters] crash in LLNotificationsUI::LLScreenChannel::addToast): Crash is due to a gesture not loading while the user is shutting down the app. A notification saying that the gesture couldn't load is trying to display while the app is shutting down, which causes a crash.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lldelayedgestureerror.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/lldelayedgestureerror.cpp b/indra/newview/lldelayedgestureerror.cpp
index 80e7c9f1b2..ef1b644ad4 100644
--- a/indra/newview/lldelayedgestureerror.cpp
+++ b/indra/newview/lldelayedgestureerror.cpp
@@ -113,9 +113,11 @@ bool LLDelayedGestureError::doDialog(const LLErrorEntry &ent, bool uuid_ok)
}
}
-
- LLNotificationsUtil::add(ent.mNotifyName, args);
-
+ if(!LLApp::isQuitting())
+ {
+ LLNotificationsUtil::add(ent.mNotifyName, args);
+ }
+
return true;
}