Merge remote-tracking branch 'github/master'

indra/llimage/llpngwrapper.h

@@ -32,7 +32,12 @@
 #ifndef LL_LLPNGWRAPPER_H
 #define LL_LLPNGWRAPPER_H
 
+#ifdef LL_STANDALONE
+#include <png.h>
+#else
+// Workaround for wrongly packaged prebuilt.
 #include "libpng15/png.h"
+#endif
 #include "llimage.h"
 
 class LLPngWrapper

indra/plugins/webkit/media_plugin_webkit.cpp

@@ -25,8 +25,8 @@
  * $/LicenseInfo$
  * @endcond
  */
-#include "llqtwebkit.h"
 #include "linden_common.h"
+#include "llqtwebkit.h"
 #include "indra_constants.h" // for indra keyboard codes
 
 #include "lltimer.h"