diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-07-03 21:21:58 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-07-03 21:21:58 +0800 |
commit | d32b1c090f396824c5ec2ffbc40b174a55bdbe0b (patch) | |
tree | bdf6f1753b8ec7b37aa0831e6ff0beeffcefd869 /indra/newview/llappviewerlinux.cpp | |
parent | b024b356c75528b4d2688016d49a11e1270fb48d (diff) | |
parent | 2283c5c35103dd99b35ca43a09bf8e11e6cd7957 (diff) |
Merge branch 'main' into gltf_mesh_import
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
-rw-r--r-- | indra/newview/llappviewerlinux.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index c1e8f38c51..376eeca9fd 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -126,7 +126,11 @@ int main( int argc, char **argv ) // install unexpected exception handler gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler); +#ifdef __aarch64__ + setenv("LD_PRELOAD", APP_PLUGIN_DIR"/libcef.so", 1); +#else unsetenv( "LD_PRELOAD" ); // <FS:ND/> Get rid of any preloading, we do not want this to happen during startup of plugins. +#endif bool ok = viewer_app_ptr->init(); if(!ok) |