diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-07-19 14:35:44 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-07-19 14:35:44 -0700 |
| commit | 8631a7a07743af00431c6f33361ab06405bcf114 (patch) | |
| tree | e7d983394f5ca0cbe2465780e8205cf32ba67ad3 /indra/newview/llcompilequeue.cpp | |
| parent | 57da3e609fddb37ef3ddef830a0be84ebc5337bd (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge with tip of Master after a Viewer release
Diffstat (limited to 'indra/newview/llcompilequeue.cpp')
| -rw-r--r-- | indra/newview/llcompilequeue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp index 5d010a6f1e..9031ea5b1b 100644 --- a/indra/newview/llcompilequeue.cpp +++ b/indra/newview/llcompilequeue.cpp @@ -347,7 +347,7 @@ void LLFloaterCompileQueue::processExperienceIdResults(LLSD result, LLUUID paren bool LLFloaterCompileQueue::processScript(LLHandle<LLFloaterCompileQueue> hfloater, const LLPointer<LLViewerObject> &object, LLInventoryObject* inventory, LLEventPump &pump) { - if (LLApp::isQuitting()) + if (LLApp::isExiting()) { // Reply from coroutine came on shutdown // We are quiting, don't start any more coroutines! |