summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-07-19 22:23:14 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-07-19 22:23:14 +0300
commit52c898b765036ccb60889d056e40eec6721de33a (patch)
treeec60ccd2f1e66b13f93784f252a8c5f2df8a309d /indra/llplugin
parent8a14d895826e6f9465da2ae3d7a007401b430041 (diff)
parentbe6066eae218856f7fd74b98968a75e5062fa830 (diff)
Merge branch 'master' into DRTVWR-543-maint
Diffstat (limited to 'indra/llplugin')
-rw-r--r--indra/llplugin/llpluginprocessparent.cpp6
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);
}