diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-16 11:12:15 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-16 11:12:15 -0500 |
commit | ee0055f5af672bef8402679fe8cc41717b0b9678 (patch) | |
tree | d2c025aa4d9469d98a0c8544e1634eedfbad0c84 /indra/llcommon/llprocesslauncher.cpp | |
parent | ad625861e120cae967d6bc60a9c1f4d86f4c2ed1 (diff) | |
parent | 73962e2134035855def0177db171d8eddaa193cb (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/llcommon/llprocesslauncher.cpp')
-rw-r--r-- | indra/llcommon/llprocesslauncher.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/llcommon/llprocesslauncher.cpp b/indra/llcommon/llprocesslauncher.cpp index 81e5f8820d..4b0f6b0251 100644 --- a/indra/llcommon/llprocesslauncher.cpp +++ b/indra/llcommon/llprocesslauncher.cpp @@ -265,14 +265,7 @@ int LLProcessLauncher::launch(void) delete[] fake_argv; mProcessID = id; - - // At this point, the child process will have been created (since that's how vfork works -- the child borrowed our execution context until it forked) - // If the process doesn't exist at this point, the exec failed. - if(!isRunning()) - { - result = -1; - } - + return result; } |