summaryrefslogtreecommitdiff
path: root/indra/newview/lldelayedgestureerror.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2013-03-21 11:21:45 -0400
committerprep <prep@lindenlab.com>2013-03-21 11:21:45 -0400
commitf3457461617119bda93f506977170cb8f15a270d (patch)
treed4b9e45586725447ef939b6876c7d19d7ff9f573 /indra/newview/lldelayedgestureerror.cpp
parent33954bbbe5517a0ad72ffc6bad7cb94985b3bf8b (diff)
parentf2948cb1eb8866716a84868cccbfafcd742c0771 (diff)
Folded in changes from sunshine-stable
Diffstat (limited to 'indra/newview/lldelayedgestureerror.cpp')
-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;
}