Merge remote-tracking branch 'singu/master'

Conflicts:
	indra/cmake/WebKitLibPlugin.cmake
	indra/llmessage/llurlrequest.cpp
	indra/plugins/webkit/media_plugin_webkit.cpp

indra/plugins/base_media/CMakeLists.txt

@@ -2,6 +2,9 @@
 
 project(media_plugin_base)
 
+# Fail at configure, not link time.
+set(OpenGL_FIND_REQUIRED ON)
+
 include(00-Common)
 include(LLCommon)
 include(LLImage)

indra/plugins/webkit/linux_volume_catcher.cpp

@@ -36,9 +36,10 @@
  */
 
 #include "linden_common.h"
-# include <set>
+#include <set>
 
 #include "volume_catcher.h"
+#include "llaprpool.h"
 
 #ifndef LL_WINDOWS
 #include <unistd.h>
@@ -53,7 +54,6 @@ extern "C" {
 #include <pulse/subscribe.h>
 #include <pulse/glib-mainloop.h> // There's no special reason why we want the *glib* PA mainloop, but the generic polling implementation seems broken.
 
-#include "llaprpool.h"
 #include "apr_dso.h"
 #ifdef LL_STANDALONE
 #include <dlfcn.h>

indra/plugins/webkit/media_plugin_webkit.cpp

@@ -25,8 +25,10 @@
  * $/LicenseInfo$
  * @endcond
  */
-#include "llqtwebkit.h"
 #include "linden_common.h"
+
+#include "llqtwebkit.h"
+
 #include "indra_constants.h" // for indra keyboard codes
 
 #include "lltimer.h"
@@ -160,7 +162,7 @@ private:
 		mVolumeCatcher.pump();
 
 		checkEditState();
-		
+	
 		if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
 		{
 			if(!mInitialNavigateURL.empty())