summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-11-16 14:18:30 +0800
committerErik Kundiman <erik@megapahit.org>2025-11-16 14:18:30 +0800
commit5064bdd8ad90f699369ce52a1a21e6d5e925da39 (patch)
tree957c4c951d19d2a182102430d6647a8ac1777e5a
parentbec4568fe1fdc1bab473065851fb51aa2b69b6d0 (diff)
parent077720c843eb8bc7ed1009997c50416591875287 (diff)
Merge branch 'main' into 2025.08
-rw-r--r--indra/newview/llappviewerlinux.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
index ae7ed17359..5bbaed750c 100644
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -134,7 +134,11 @@ int main( int argc, char **argv )
#ifdef __aarch64__
setenv("LD_PRELOAD", APP_PLUGIN_DIR"/libcef.so", 1);
#else
+# if LL_LINUX
setenv("LD_PRELOAD", "libpthread.so.0 libGL.so.1", 1);
+# else
+ setenv("LD_PRELOAD", "libpthread.so libGL.so.1", 1);
+# endif
setenv("__GL_THREADED_OPTIMIZATIONS", "1", 0);
#endif