Merge branch '1.1.0a-gstreamer' into next

1 files changed, 5 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index af436c5..4953410 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -41,6 +41,7 @@
 
 #include "llcurl.h"
 #include "llimagej2c.h"
+#include "audioengine.h"
 
 #include "llviewertexteditor.h"
 #include "llviewercontrol.h"
@@ -200,6 +201,10 @@ LLFloaterAbout::LLFloaterAbout()
         support.append( LLImageJ2C::getEngineInfo() );
         support.append("\n");
 
+        support.append("Audio Driver Version: ");
+        support.append( gAudiop ? gAudiop->getDriverName(true) : "(none)" );
+        support.append("\n");
+
         LLMediaManager *mgr = LLMediaManager::getInstance();
         if (mgr)
         {