diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-22 10:06:45 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-22 10:06:45 -0500 |
| commit | d33bb1fe675a926a434539c3e59c13c35d425fe3 (patch) | |
| tree | 64c2fe2e02d2dfd008bf2040616a614fc09f4835 /indra/newview/llappviewer.cpp | |
| parent | f179fcd0006bdfd0ea99041d0d663049466ffd2a (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
merge
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); |