From 169670a58b18b10455af2399de7cc9942eb1da9a Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Mon, 13 Aug 2012 19:30:35 +0200
Subject: [PATCH] Refurbish last merge. Fix compile for standalone and libcwd.

---
 indra/llimage/llpngwrapper.h                 | 5 +++++
 indra/llmessage/llares.cpp                   | 1 +
 indra/plugins/webkit/media_plugin_webkit.cpp | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h
index 7def0c713..276709d1a 100644
--- a/indra/llimage/llpngwrapper.h
+++ b/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
diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp
index 48d3f9108..91d13dac3 100644
--- a/indra/llmessage/llares.cpp
+++ b/indra/llmessage/llares.cpp
@@ -37,6 +37,7 @@
 #include "apr_poll.h"
 
 #include "llapr.h"
+#include "llaprpool.h"
 #include "llareslistener.h"
 
 #if defined(LL_WINDOWS)
diff --git a/indra/plugins/webkit/media_plugin_webkit.cpp b/indra/plugins/webkit/media_plugin_webkit.cpp
index 9809a9e5e..e64a89d88 100644
--- a/indra/plugins/webkit/media_plugin_webkit.cpp
+++ b/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"