summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-06-07 21:05:56 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-06-07 21:05:56 +0300
commit681298dd726b2d00910fe71646147fadd1aba980 (patch)
tree76b3a3fd2c3e5fd2330a947b860108ec18658e79 /indra/llplugin
parent323f41f4892248762fc8505d8df17d70bd833cf3 (diff)
parentfa8f1862130fdef81f83e977743299623a50b7c7 (diff)
Merge branch 'DRTVWR-520-apple-notarization' into DRTVWR-540-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);
}