diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-22 15:02:25 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-22 15:02:25 -0500 |
| commit | 655c2bd33757ce7ad5da2772f2cae8785898cbdb (patch) | |
| tree | 319ef56eab5b71af7ce5e94ab6f16b739d83edb8 /indra/newview/llappviewer.cpp | |
| parent | 87a033d3bf1af2b3cba1047b720e7d93f535dc46 (diff) | |
| parent | 79a89f5d921f99ba7a990a1dbf7428d1d3758bc6 (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); |