summaryrefslogtreecommitdiff
path: root/indra/newview/lldelayedgestureerror.cpp
diff options
context:
space:
mode:
authorprep@lindenlab.com <prep@lindenlab.com>2013-03-20 17:53:51 -0500
committerprep@lindenlab.com <prep@lindenlab.com>2013-03-20 17:53:51 -0500
commitf2948cb1eb8866716a84868cccbfafcd742c0771 (patch)
tree394df20f229f87428252c02d2402c511b9fa7aa8 /indra/newview/lldelayedgestureerror.cpp
parent779e132cbfc46a0eda97a0331e39cbc6e686c07b (diff)
parent4a2fb4c64f2079089b78202e53bbe1dbe8ac09c7 (diff)
Merge with viewer-chui
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;
}