diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
| commit | 1333e9332a074e25178cd28b351bb40998617e10 (patch) | |
| tree | c229dd9782a27e3c72d7d99c4a6e15367fb8dbd9 /indra/newview/llappviewer.cpp | |
| parent | 6a3cb427071641585d9beb44c3e46a148f90a791 (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
merge changes for 3.7.23
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); |