diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/llappviewerlinux.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index e94a212151..c8519c301d 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -208,7 +208,7 @@ if (LINUX) install(FILES ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so.13 - ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so.13.31 + ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so.13.32 DESTINATION ${_LIB}) endif (USE_FMODSTUDIO) endif (LINUX) 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 |