diff options
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
| -rw-r--r-- | indra/newview/llappviewerlinux.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 2fd0eebd44..cb899ef577 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -204,7 +204,13 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) // install unexpected exception handler gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler); - unsetenv( "LD_PRELOAD" ); // <FS:ND/> Get rid of any preloading, we do not want this to happen during startup of plugins. +# 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); + //unsetenv( "LD_PRELOAD" ); // <FS:ND/> Get rid of any preloading, we do not want this to happen during startup of plugins. // This needs to be set as early as possible SDL_SetAppMetadataProperty(SDL_PROP_APP_METADATA_NAME_STRING, LLVersionInfo::getInstance()->getChannel().c_str()); |