diff options
author | Callum Prentice <callum@lindenlab.com> | 2010-01-07 11:38:36 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2010-01-07 11:38:36 -0800 |
commit | fb99db68a0faf2ee51b944dc661e7e957378a5d4 (patch) | |
tree | 65befed13332b7534c16e48d627c5ac706eb22ad /indra | |
parent | 27bd65129b6f78aa2a7b75e7ef6c3fd33455c766 (diff) |
Fix for EXT-3781 "installer on Vista: error opening file for writing ."
Reviewed by MW
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llplugin/llpluginprocesschild.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp index ccf6dab942..07fc82c770 100644 --- a/indra/llplugin/llpluginprocesschild.cpp +++ b/indra/llplugin/llpluginprocesschild.cpp @@ -54,8 +54,14 @@ LLPluginProcessChild::~LLPluginProcessChild() if(mInstance != NULL) { sendMessageToPlugin(LLPluginMessage("base", "cleanup")); - delete mInstance; - mInstance = NULL; + + // IMPORTANT: under some (unknown) circumstances the apr_dso_unload() triggered when mInstance is deleted + // appears to fail and lock up which means that a given instance of the slplugin process never exits. + // This is bad, especially when users try to update their version of SL - it fails because the slplugin + // process as well as a bunch of plugin specific files are locked and cannot be overwritten. + exit( 0 ); + //delete mInstance; + //mInstance = NULL; } } |