From d5d5fd815f2833bdc968d35a213a12380ac0dec6 Mon Sep 17 00:00:00 2001
From: Hecklezz <tj8@live.com.au>
Date: Tue, 8 Sep 2026 20:42:53 +1000
Subject: Fix SLPlugin error when it unloads libcef

---
 indra/llplugin/llpluginprocesschild.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/llplugin/llpluginprocesschild.cpp')

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;
 
-- 
cgit v1.3