diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-02-04 17:12:19 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-02-04 17:12:19 +0200 |
| commit | 6627d684a20dbc420de7814066c31a930c0e0e10 (patch) | |
| tree | 7c0a056f65e956179a18c5a91974c4b79fe988e2 /indra/newview/linux_tools | |
| parent | e76f25d25fb96965fcf37a477bbf8c14ef1eccb2 (diff) | |
SL-12654 Remove support for building with fmod ex
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 | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt index e01b9e4bc6..aaa8a6b6d7 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 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..e04090297c 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -4,6 +4,8 @@ ## These options are for self-assisted troubleshooting during this beta ## testing phase; you should not usually need to touch them. +## - Avoids using any FMOD STUDIO audio driver. +#export LL_BAD_FMODSTUDIO_DRIVER=x ## - Avoids using any FMOD Ex audio driver. #export LL_BAD_FMODEX_DRIVER=x ## - Avoids using any OpenAL audio driver. |