diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-09-22 14:55:07 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-09-22 14:55:07 +0800 |
| commit | 66877554dbdec33d28171420a2b4fde65e309e7c (patch) | |
| tree | be44385b4713d920bad4f77a4905b87f0eb5254a /indra/llplugin/llpluginprocesschild.cpp | |
| parent | 9391fa2734ae74e9d49d74f7b2df181b526c6605 (diff) | |
| parent | 8fb3801667bf5f8fadfe191d8628b2b3cf443273 (diff) | |
Merge tag 'Second_Life_Develop#8fb38016-2026-09-12' into 26.5
Diffstat (limited to 'indra/llplugin/llpluginprocesschild.cpp')
| -rw-r--r-- | indra/llplugin/llpluginprocesschild.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp index a854ced7aa..6c15200886 100644 --- a/indra/llplugin/llpluginprocesschild.cpp +++ b/indra/llplugin/llpluginprocesschild.cpp @@ -241,8 +241,10 @@ void LLPluginProcessChild::idle(void) case STATE_UNLOADED: killSockets(); - delete mInstance; - mInstance = NULL; + // Deleting mInstance here causes apr_dso_unload() to trigger a fault on SLPlugin when it unloads libcef + // Instead, let the process exit on its own and allow the OS reclaim the memory to prevent the error + //delete mInstance; + //mInstance = NULL; setState(STATE_DONE); break; |
