Merge branch 'mccabe-plugins' into plugins_merge

Conflicts:
	linden/doc/contributions.txt
	linden/indra/cmake/GStreamer.cmake
	linden/indra/cmake/LLMedia.cmake
	linden/indra/cmake/OPENAL.cmake
	linden/indra/llmedia/CMakeLists.txt
	linden/indra/llprimitive/material_codes.h
	linden/indra/newview/chatbar_as_cmdline.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/pipeline.h
	linden/indra/newview/viewer_manifest.py
	linden/install.xml

1 files changed, 5 insertions, 22 deletions

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 900f6e7..7aed095 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -42,7 +42,7 @@
 
 #include "llcurl.h"
 #include "llimagej2c.h"
-#include "audioengine.h"
+#include "llaudioengine.h"
 
 #include "hippoGridManager.h"
 #include "llviewertexteditor.h"
@@ -57,7 +57,6 @@
 #include "lltrans.h"
 #include "llappviewer.h" 
 #include "llglheaders.h"
-#include "llmediamanager.h"
 #include "llwindow.h"
 #include "viewerversion.h"
 
@@ -242,26 +241,10 @@ LLFloaterAbout::LLFloaterAbout()
 
         support.append("\n");
 
-        LLMediaManager *mgr = LLMediaManager::getInstance();
-        if (mgr)
-        {
-                LLMediaBase *gstreamer = mgr->createSourceFromMimeType("http", "audio/mpeg");
-                if (gstreamer)
-                {
-                        support.append("GStreamer Version: ");
-                        support.append( gstreamer->getVersion() );
-                        support.append("\n");
-                } 
-
-                LLMediaBase *media_source = mgr->createSourceFromMimeType("http", "text/html");
-                if (media_source)
-                {
-                        support.append("LLMozLib Version: ");
-                        support.append(media_source->getVersion());
-                        support.append("\n");
-                        mgr->destroySource(media_source);
-                }
-        }
+        // TODO: Implement media plugin version query
+
+        support.append("Qt Webkit Version: 4.5.2 ");
+        support.append("\n");
 
         if (gPacketsIn > 0)
         {