viewer side tweaks to allow using latest CEF/dullahan.
parent
466393fc0d
commit
d68fe4aa87
|
|
@ -250,15 +250,6 @@ public:
|
|||
* executable name.
|
||||
*/
|
||||
Optional<std::string> desc;
|
||||
|
||||
/**
|
||||
<FS:ND> 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<std::string> preload;
|
||||
|
||||
};
|
||||
typedef LLSDParamAdapter<Params> LLSDOrParams;
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -156,6 +156,7 @@ int main( int argc, char **argv )
|
|||
// install crash handlers
|
||||
viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
|
||||
|
||||
unsetenv( "LD_PRELOAD" ); // <FS:ND/> Get rid of any preloading, we do not want this to happen during startup of plugins.
|
||||
exportFlashVars(); // <FS:ND/> Try to autodetect installed pepper flash.
|
||||
|
||||
bool ok = viewer_app_ptr->init();
|
||||
|
|
|
|||
Loading…
Reference in New Issue