aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-09-09 05:06:41 -0700
committerArmin Weatherwax2010-09-23 15:42:41 +0200
commitadc28fac384c713638946a37df2628dbffed3244 (patch)
treee6db9700f2e6c99ddcde4e5090ba39f7f056761c /linden
parentRemoved more unused 'prepare' dependencies (diff)
downloadmeta-impy-adc28fac384c713638946a37df2628dbffed3244.zip
meta-impy-adc28fac384c713638946a37df2628dbffed3244.tar.gz
meta-impy-adc28fac384c713638946a37df2628dbffed3244.tar.bz2
meta-impy-adc28fac384c713638946a37df2628dbffed3244.tar.xz
Fixed plugin compile issues on windows
Diffstat (limited to '')
-rwxr-xr-xlinden/indra/media_plugins/webkit/media_plugin_webkit.cpp1
-rw-r--r--linden/indra/media_plugins/webkit/windows_volume_catcher.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
index f9b6451..ebf64f8 100755
--- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -37,6 +37,7 @@
37 37
38#include "linden_common.h" 38#include "linden_common.h"
39#include "indra_constants.h" // for indra keyboard codes 39#include "indra_constants.h" // for indra keyboard codes
40#include <iomanip>
40 41
41#include "llgl.h" 42#include "llgl.h"
42 43
diff --git a/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp b/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp
index c02e7fc..f1afea7 100644
--- a/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp
+++ b/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp
@@ -35,7 +35,7 @@
35 35
36#include "volume_catcher.h" 36#include "volume_catcher.h"
37#include <windows.h> 37#include <windows.h>
38#include "llsingleton.h" 38#include "llmemory.h"
39class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl> 39class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl>
40{ 40{
41friend LLSingleton<VolumeCatcherImpl>; 41friend LLSingleton<VolumeCatcherImpl>;