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/llplugin | |
| parent | 57da3e609fddb37ef3ddef830a0be84ebc5337bd (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge with tip of Master after a Viewer release
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/llpluginprocessparent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index a89561fce0..e50db69190 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -155,9 +155,9 @@ void LLPluginProcessParent::shutdown() { EState state = (*it).second->mState; if (state != STATE_CLEANUP - || state != STATE_EXITING - || state != STATE_DONE - || state != STATE_ERROR) + && state != STATE_EXITING + && state != STATE_DONE + && state != STATE_ERROR) { (*it).second->setState(STATE_GOODBYE); } |