diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-06-19 17:18:18 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-06-19 17:18:18 +0000 |
| commit | 5df284b23a2e7db47cf89de72044fe5d3df1ccf4 (patch) | |
| tree | a543deec1323c4dc1cc42207277d0c47bbebdb66 /indra/newview/linux_tools | |
| parent | b84e79e0f206ac49aa57c4ad2d8d3dd7b5d2fc4d (diff) | |
| parent | ba6a0f3f332ffc659b00ca4c298b96efe56c6b81 (diff) | |
Merged in merge-6.4.4 (pull request #167)
Merge master 6.4.4 into DRTVWR-510
Diffstat (limited to 'indra/newview/linux_tools')
| -rw-r--r-- | indra/newview/linux_tools/client-readme.txt | 4 | ||||
| -rwxr-xr-x | indra/newview/linux_tools/wrapper.sh | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt index e01b9e4bc6..cb8d1af535 100644 --- a/indra/newview/linux_tools/client-readme.txt +++ b/indra/newview/linux_tools/client-readme.txt @@ -187,8 +187,8 @@ The 'secondlife' script which launches Second Life contains some configuration options for advanced troubleshooters. * AUDIO - Edit the 'secondlife' script and you will see these audio - options: LL_BAD_OPENAL_DRIVER, LL_BAD_FMOD_ESD, LL_BAD_FMOD_OSS, and - LL_BAD_FMOD_ALSA. Second Life tries to use OpenAL, ESD, OSS, then ALSA + options: LL_BAD_OPENAL_DRIVER, LL_BAD_FMODSTUDIO_DRIVER. + Second Life tries to use OpenAL, FMODSTUDIO (PULSEAUDIO, ALSA) audio drivers in this order; you may uncomment the corresponding LL_BAD_* option to skip an audio driver which you believe may be causing you trouble. diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index c23401d5a6..eb3ead433b 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -4,17 +4,15 @@ ## These options are for self-assisted troubleshooting during this beta ## testing phase; you should not usually need to touch them. -## - Avoids using any FMOD Ex audio driver. -#export LL_BAD_FMODEX_DRIVER=x +## - Avoids using any FMOD STUDIO audio driver. +#export LL_BAD_FMODSTUDIO_DRIVER=x ## - Avoids using any OpenAL audio driver. #export LL_BAD_OPENAL_DRIVER=x -## - Avoids using the FMOD Ex PulseAudio audio driver. +## - Avoids using the FMOD Studio or FMOD Ex PulseAudio audio driver. #export LL_BAD_FMOD_PULSEAUDIO=x -## - Avoids using the FMOD or FMOD Ex ALSA audio driver. +## - Avoids using the FMOD Studio or FMOD Ex ALSA audio driver. #export LL_BAD_FMOD_ALSA=x -## - Avoids using the FMOD or FMOD Ex OSS audio driver. -#export LL_BAD_FMOD_OSS=x ## - Avoids the optional OpenGL extensions which have proven most problematic ## on some hardware. Disabling this option may cause BETTER PERFORMANCE but |