summaryrefslogtreecommitdiff
path: root/indra/newview/lldelayedgestureerror.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-04-02 11:18:29 -0500
committerDave Parks <davep@lindenlab.com>2013-04-02 11:18:29 -0500
commit3e8da4e8d5ec7a477db00de99ec4c75985c17094 (patch)
treea76d4b02258d9b2d3d12e7640a7a50830c007241 /indra/newview/lldelayedgestureerror.cpp
parent8f9ddc67fdcdf53313ae4217ffa551a5a157c765 (diff)
parent5f5732365b3c5a3b85fdc0be6fbbbbc0c2de01f2 (diff)
Automated merge with https://bitbucket.org/lindenlab/davep-materials
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;
}