Merge release/26.5 into project/chat-modernization

Preserve the history reader's page position while incorporating the focused page-selector refresh fix.

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;