diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2019-12-16 12:47:19 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2019-12-16 12:47:19 -0700 |
| commit | f61a5c4642db8af5d80eacc0ca7a2062bf08e4f0 (patch) | |
| tree | e644e1db27f9ea9043d4adeeafc3da5ebdd8e211 /indra/llplugin | |
| parent | bc06a9acf91035903d497bdd66e9bb26859616be (diff) | |
| parent | d656d49a77eeb65ae537c954ea4009bc22da7b2b (diff) | |
Merge viewer-release 6.3.6 into viewwer-eep repo
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/llpluginprocesschild.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp index 594793cf56..c5304d2ccf 100644 --- a/indra/llplugin/llpluginprocesschild.cpp +++ b/indra/llplugin/llpluginprocesschild.cpp @@ -33,7 +33,7 @@ #include "llpluginmessagepipe.h" #include "llpluginmessageclasses.h" -static const F32 GOODBYE_SECONDS = 20.0f; +static const F32 GOODBYE_SECONDS = 12.0f; // Do not set it to be bigger than mPluginLockupTimeout or parent will kill LLPluginProcessChild static const F32 HEARTBEAT_SECONDS = 1.0f; static const F32 PLUGIN_IDLE_SECONDS = 1.0f / 100.0f; // Each call to idle will give the plugin this much time. @@ -218,6 +218,11 @@ void LLPluginProcessChild::idle(void) if (mWaitGoodbye.hasExpired()) { LL_WARNS() << "Wait for goodbye expired. Advancing to UNLOADED" << LL_ENDL; + if (mInstance != NULL) + { + // Something went wrong, at least make sure plugin will terminate + sendMessageToPlugin(LLPluginMessage("base", "force_exit")); + } setState(STATE_UNLOADED); } break; |