summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-07-19 22:24:33 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-07-19 22:24:33 +0000
commit1b15b8cda7853e55a91fd0140311ed69f3cca677 (patch)
tree33edfb0495161594a50dcfbed3a3f42e7fde9143 /indra/llplugin
parentdc14dbf54d332a6cdc43002bb71ed71e9a473647 (diff)
parent4c849ba91363f82da05cce1221b04075a6ca72af (diff)
Merged in DV528-merge-6.4.22 (pull request #630)
DRTVWR-528 merge up to v 6.4.22
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);
}