diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-10-09 17:37:52 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-10-09 17:37:52 -0400 |
| commit | f1519deb9ed8aacc2cc5d9c023bb7f5abba62313 (patch) | |
| tree | 3fe36e6ebd20943d82763d8fe1e19f89b13fa882 /indra/newview/llappviewer.cpp | |
| parent | ed9685e41b1b91f63de1964661dacb0718f73186 (diff) | |
| parent | 825b4339db535c2672fd5b8779d142f093aec974 (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); |