Skip to content
Snippets Groups Projects
Commit 962a42a3 authored by skolb's avatar skolb
Browse files

Merge

parents a9e409c7 5e4d7ec7
Branches
Tags
No related merge requests found
...@@ -80,7 +80,9 @@ LLPluginProcessParent::~LLPluginProcessParent() ...@@ -80,7 +80,9 @@ LLPluginProcessParent::~LLPluginProcessParent()
mSharedMemoryRegions.erase(iter); mSharedMemoryRegions.erase(iter);
} }
mProcess.kill(); // orphaning the process means it won't be killed when the LLProcessLauncher is destructed.
// This is what we want -- it should exit cleanly once it notices the sockets have been closed.
mProcess.orphan();
killSockets(); killSockets();
} }
...@@ -414,7 +416,8 @@ void LLPluginProcessParent::idle(void) ...@@ -414,7 +416,8 @@ void LLPluginProcessParent::idle(void)
break; break;
case STATE_CLEANUP: case STATE_CLEANUP:
mProcess.kill(); // Don't do a kill here anymore -- closing the sockets is the new 'kill'.
mProcess.orphan();
killSockets(); killSockets();
setState(STATE_DONE); setState(STATE_DONE);
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment