From ba3e89b5c731ed6dc36d4650928be8081b3289f5 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 18 Jan 2013 16:43:19 -0800 Subject: first push - patch from CmdCupCake plus force FMODEX on --- indra/newview/linux_tools/wrapper.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'indra/newview/linux_tools') diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index 20936c6460..71b7e74c63 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -4,17 +4,21 @@ ## 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 OpenAL audio driver. #export LL_BAD_OPENAL_DRIVER=x ## - Avoids using any FMOD audio driver. #export LL_BAD_FMOD_DRIVER=x +## - Avoids using the FMOD Ex PulseAudio audio driver. +#export LL_BAD_FMOD_PULSEAUDIO=x +## - Avoids using the FMOD 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 using the FMOD ESD audio driver. #export LL_BAD_FMOD_ESD=x -## - Avoids using the FMOD OSS audio driver. -#export LL_BAD_FMOD_OSS=x -## - Avoids using the FMOD ALSA audio driver. -#export LL_BAD_FMOD_ALSA=x ## - Avoids the optional OpenGL extensions which have proven most problematic ## on some hardware. Disabling this option may cause BETTER PERFORMANCE but -- cgit v1.2.3 From bc161b040a5f6817a9adcec759e48bf590c2ed45 Mon Sep 17 00:00:00 2001 From: Sovereign Engineer Date: Mon, 4 Feb 2013 08:21:19 -0500 Subject: Remove FMOD 3.75 leftovers --- indra/newview/linux_tools/wrapper.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'indra/newview/linux_tools') diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index 71b7e74c63..17f39aaa7e 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -8,17 +8,13 @@ #export LL_BAD_FMODEX_DRIVER=x ## - Avoids using any OpenAL audio driver. #export LL_BAD_OPENAL_DRIVER=x -## - Avoids using any FMOD audio driver. -#export LL_BAD_FMOD_DRIVER=x - +s ## - Avoids using the FMOD Ex PulseAudio audio driver. #export LL_BAD_FMOD_PULSEAUDIO=x ## - Avoids using the FMOD 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 using the FMOD ESD audio driver. -#export LL_BAD_FMOD_ESD=x ## - Avoids the optional OpenGL extensions which have proven most problematic ## on some hardware. Disabling this option may cause BETTER PERFORMANCE but -- cgit v1.2.3 From a05afe036cba1a85043db99e80045ae40e6a6d6c Mon Sep 17 00:00:00 2001 From: Sovereign Engineer Date: Mon, 4 Feb 2013 10:07:06 -0500 Subject: Removed small typo in linux wrapper script --- indra/newview/linux_tools/wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/linux_tools') diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index 17f39aaa7e..ef3746c90b 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -8,7 +8,7 @@ #export LL_BAD_FMODEX_DRIVER=x ## - Avoids using any OpenAL audio driver. #export LL_BAD_OPENAL_DRIVER=x -s + ## - Avoids using the FMOD Ex PulseAudio audio driver. #export LL_BAD_FMOD_PULSEAUDIO=x ## - Avoids using the FMOD or FMOD Ex ALSA audio driver. -- cgit v1.2.3 From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Fri, 29 Mar 2013 07:50:08 -0700 Subject: Update Mac and Windows breakpad builds to latest --- indra/newview/linux_tools/client-readme-joystick.txt | 0 indra/newview/linux_tools/client-readme-voice.txt | 0 indra/newview/linux_tools/client-readme.txt | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/newview/linux_tools/client-readme-joystick.txt mode change 100644 => 100755 indra/newview/linux_tools/client-readme-voice.txt mode change 100644 => 100755 indra/newview/linux_tools/client-readme.txt (limited to 'indra/newview/linux_tools') diff --git a/indra/newview/linux_tools/client-readme-joystick.txt b/indra/newview/linux_tools/client-readme-joystick.txt old mode 100644 new mode 100755 diff --git a/indra/newview/linux_tools/client-readme-voice.txt b/indra/newview/linux_tools/client-readme-voice.txt old mode 100644 new mode 100755 diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt old mode 100644 new mode 100755 -- cgit v1.2.3