diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-12-19 06:00:48 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-12-19 06:00:48 -0800 |
| commit | b0f590f6ab4033503ff9d80e2374e374397d40fb (patch) | |
| tree | 97e9758c011105b48218cbd2e611c51cc967520d /indra/newview/llappviewer.cpp | |
| parent | d0d5a6a15cf3c573c89ce590030c7a150b19dd05 (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 3a5008507a..f6b6c71cfc 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4896,7 +4896,10 @@ void LLAppViewer::idle() // Handle the regular UI idle callbacks as well as // hover callbacks // - + +#ifdef LL_DARWIN + if (!mQuitRequested) //MAINT-4243 +#endif { // LL_RECORD_BLOCK_TIME(FTM_IDLE_CB); |