QAR-1040 maint-viewer-11 + OpenAL combo mergeme

svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448

3 files changed, 24 insertions, 23 deletions

diff --git a/indra/newview/linux_tools/client-readme-voice.txt b/indra/newview/linux_tools/client-readme-voice.txt
index 7754a3a734..23a42f484b 100644
--- a/indra/newview/linux_tools/client-readme-voice.txt
+++ b/indra/newview/linux_tools/client-readme-voice.txt
@@ -21,15 +21,13 @@ REQUIREMENTS
 
 Success with Linux Voice support has been reported on the following
 systems:
-* Ubuntu 7.04 (Feisty) with USB Plantronics headset
-* Ubuntu 7.04 (Feisty) with Intel HDA audio chipset
 * Ubuntu 6.06 (Dapper) with Intel ICH5/CMI9761A+ audio chipset
 * Ubuntu 6.06 (Dapper) with SigmaTel STAC2997 audio chipset
-* Fedora Core 6 with (unknown) audio chipset
-
-Problems with Linux Voice support have been reported on the following
-systems:
 * Ubuntu 6.06 (Dapper) with Creative EMU10K1 audio chipset
+* Ubuntu 7.04 (Feisty) with USB Plantronics headset
+* Ubuntu 7.04 (Feisty) with Intel HDA audio chipset
+* Fedora Core 6 with (unknown) audio chipset
+* Ubuntu 8.04 (Hardy) with (unknown) audio chipset
 
 KNOWN PROBLEMS
 -=-=-=-=-=-=-=
diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt
index c4e193bd9b..543a7a1881 100644
--- a/indra/newview/linux_tools/client-readme.txt
+++ b/indra/newview/linux_tools/client-readme.txt
@@ -15,7 +15,7 @@ Life itself - please see <http://www.secondlife.com/whatis/>.
    5.3. Blank window after minimizing it
    5.4. Audio
    5.5. 'Alt' key for camera controls doesn't work
-   5.6. In-world movie playback
+   5.6. In-world streaming movie/music playback
 6. Advanced Troubleshooting
    6.1. Audio
    6.2. OpenGL
@@ -173,11 +173,11 @@ SOLUTION:- Some window managers eat the Alt key for their own purposes; you
    example, the 'Windows' key!) which will allow the Alt key to function
    properly with mouse actions in Second Life and other applications.
 
-PROBLEM 6:- In-world movie playback doesn't work for me.
+PROBLEM 6:- In-world movie and/or music playback doesn't work for me.
 SOLUTION:- You need to have a working installation of GStreamer 0.10; this
    is usually an optional package for most versions of Linux.  If you have
-   installed GStreamer 0.10 and you can play some movies but not others then
-   you need to install a wider selection of GStreamer plugins, either
+   installed GStreamer 0.10 and you can play some music/movies but not others
+   then you need to install a wider selection of GStreamer plugins, either
    from your vendor or an appropriate third party.
 
 
@@ -187,11 +187,11 @@ SOLUTION:- You need to have a working installation of GStreamer 0.10; this
 The 'secondlife' script which launches Second Life contains some
 configuration options for advanced troubleshooters.
 
-* AUDIO - Edit the 'secondlife' script and you will see three audio
-  options: LL_BAD_ESD, LL_BAD_OSS, LL_BAD_ALSA.  Second Life tries to
-  use ESD, OSS, then 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.
+* 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
+  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.
 
 * OPENGL - For advanced troubleshooters, the LL_GL_BLACKLIST option lets
   you disable specific GL extensions, each of which is represented by a
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index 9d2e06b31e..d7b17edbc3 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -4,14 +4,17 @@
 ## These options are for self-assisted troubleshooting during this beta
 ## testing phase; you should not usually need to touch them.
 
-## - Avoids using the ESD audio driver.
-#export LL_BAD_ESD=x
-
-## - Avoids using the OSS audio driver.
-#export LL_BAD_OSS=x
-
-## - Avoids using the ALSA audio driver.
-#export LL_BAD_ALSA=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 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