diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-19 22:22:58 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-19 22:22:58 +0300 |
| commit | 3e85f6a8c9d34c64ab19af03015efcd8d4c93f80 (patch) | |
| tree | 42deaa6134afb3e4b9bcb3f7ec26aa2633026f5d /indra/llplugin/llpluginprocessparent.cpp | |
| parent | e7563ff13fe1e6e77a0c6de5dcf0c1b67a6d2e2c (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' into DRTVWR-540-maint
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.cpp')
| -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 7d18bae947..e5b4dec1bd 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -154,9 +154,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); } |