diff options
| author | simon <none@none> | 2014-10-09 11:07:33 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-10-09 11:07:33 -0700 |
| commit | e8a5c06dc47bbd1965c852890446f9d8b9d2c68b (patch) | |
| tree | bcc8835cb8ccf49bc11a2534f9759dad1d5bd1c2 /indra/newview/llappviewer.cpp | |
| parent | d7db567f27e6cc30aaffaf38d6ea219a7adf4678 (diff) | |
| parent | fa4fdedf51e37a195f5ee6688f1e3a7a0e2bf160 (diff) | |
Merge downstream code and become 3.7.18
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); |