diff options
| -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 7a704b71f3..c39ac815c0 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -408,10 +408,10 @@ void LLPluginProcessParent::idle(void) mMessagePipe->pumpOutput(); // Only do input processing here if this instance isn't in a pollset. - // If we are shutting down plugin, owner is null and we can't process - // input, we are here only to send shutdown_plugin message + // If viewer and plugin are both shutting down, don't process further + // input, viewer won't be able to handle it. if(!mPolledInput - && mState != STATE_GOODBYE) + && !(mState >= STATE_GOODBYE && LLApp::isExiting())) { mMessagePipe->pumpInput(); } |