diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-20 18:32:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-20 18:32:29 -0400 |
| commit | e6b7a7e2f6a5175dd6c3e1d8d8c8f8c0e737a030 (patch) | |
| tree | 1fc66c532666cdd061ec12e10b99bcb3be00d64e /indra/newview/lldelayedgestureerror.cpp | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
| parent | 2d19d78846ccbd8993c468cc27b8db7f0b93b235 (diff) | |
merge changes for DRTVWR-303
Diffstat (limited to 'indra/newview/lldelayedgestureerror.cpp')
| -rw-r--r-- | indra/newview/lldelayedgestureerror.cpp | 8 |
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; } |