From d68fe4aa872cab0c72e7d13b2a33ded04e416183 Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 21 May 2020 23:41:06 +0200 Subject: [PATCH] viewer side tweaks to allow using latest CEF/dullahan. --- indra/llcommon/llprocess.h | 9 --------- indra/newview/linux_tools/wrapper.sh | 2 -- indra/newview/llappviewerlinux.cpp | 1 + 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/indra/llcommon/llprocess.h b/indra/llcommon/llprocess.h index ae98e6e37e..e3386ad88e 100644 --- a/indra/llcommon/llprocess.h +++ b/indra/llcommon/llprocess.h @@ -250,15 +250,6 @@ public: * executable name. */ Optional desc; - - /** - HACK! libcef.so bleeds that intrusive tcmalloc hacks all over the process. - This then causes awesome effects like crashes and memory corruption when the so is loaded dynamically. - We uses this argument to force libcef.so be preloaded, which fixes this. - The other solution would be to recompile CEF twice (x86/x64) for each CEF update. Which I really would like to avoid. - */ - Optional preload; - }; typedef LLSDParamAdapter LLSDOrParams; diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index 0654a07b4e..0ba74ef072 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -151,8 +151,6 @@ then export LD_PRELOAD="${LD_PRELOAD}:${FSJEMALLOC}" fi -export FS_CEF_PRELOAD="libcef.so" - # Copy "$@" to ARGS array specifically to delete the --skip-gridargs switch. # The gridargs.dat file is no more, but we still want to avoid breaking # scripts that invoke this one with --skip-gridargs. diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 9c5510a739..fc80404865 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -156,6 +156,7 @@ int main( int argc, char **argv ) // install crash handlers viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash); + unsetenv( "LD_PRELOAD" ); // Get rid of any preloading, we do not want this to happen during startup of plugins. exportFlashVars(); // Try to autodetect installed pepper flash. bool ok = viewer_app_ptr->init();