1 files changed, 39 insertions, 5 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 6371f2b..c863d19 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -45,6 +45,10 @@
 # include "audioengine_fmod.h"
 #endif
 
+#ifdef LL_OPENAL
+#include "audioengine_openal.h"
+#endif
+
 #include "llares.h"
 #include "llcachename.h"
 #include "llviewercontrol.h"
@@ -579,10 +583,28 @@ bool idle_startup()
 
                 if (FALSE == gSavedSettings.getBOOL("NoAudio"))
                 {
-#ifdef LL_FMOD
-                        gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD();
-#else
                         gAudiop = NULL;
+
+#ifdef LL_OPENAL
+                        if (!gAudiop
+#if !LL_WINDOWS
+                            && NULL == getenv("LL_BAD_OPENAL_DRIVER")
+#endif // !LL_WINDOWS
+                            )
+                        {
+                                gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL();
+                        }
+#endif
+
+#ifdef LL_FMOD                  
+                        if (!gAudiop
+#if !LL_WINDOWS
+                            && NULL == getenv("LL_BAD_FMOD_DRIVER")
+#endif // !LL_WINDOWS
+                            )
+                        {
+                                gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD();
+                        }
 #endif
 
                         if (gAudiop)
@@ -595,15 +617,21 @@ bool idle_startup()
                                 void* window_handle = NULL;
 #endif
                                 bool init = gAudiop->init(kAUDIO_NUM_SOURCES, window_handle);
-                                if(!init)
+                                if(init)
+                                {
+                                        gAudiop->setMuted(TRUE);
+                                }
+                                else
                                 {
                                         LL_WARNS("AppInit") << "Unable to initialize audio engine" << LL_ENDL;
+                                        delete gAudiop;
+                                        gAudiop = NULL;
                                 }
-                                gAudiop->setMuted(TRUE);
                         }
                 }
                 
                 LL_INFOS("AppInit") << "Audio Engine Initialized." << LL_ENDL;
+
                 
                 if (LLTimer::knownBadTimer())
                 {
@@ -750,6 +778,12 @@ bool idle_startup()
                 gLoginMenuBarView->setVisible( TRUE );
                 gLoginMenuBarView->setEnabled( TRUE );
 
+                // DEV-16927.  The following code removes errant keystrokes that happen while the window is being 
+                // first made visible.
+#ifdef _WIN32
+                MSG msg;
+                while( PeekMessage( &msg, /*All hWnds owned by this thread */ NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE ) );
+#endif
                 timeout.reset();
                 return FALSE;
         }