From e6bfaa3d5b5ae3d0595cd17be034fcbea9f45dde Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 16:02:50 -0700
Subject: Update to build on Xcode 6.0: fix cocoa NSWindow redefinition error

---
 indra/llplugin/slplugin/slplugin-objc.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llplugin')

diff --git a/indra/llplugin/slplugin/slplugin-objc.h b/indra/llplugin/slplugin/slplugin-objc.h
index f2c2b3239c..af0ebe1af2 100755
--- a/indra/llplugin/slplugin/slplugin-objc.h
+++ b/indra/llplugin/slplugin/slplugin-objc.h
@@ -29,7 +29,9 @@
  */
 
 //Protos for ObjectiveC classes (cannot import cocoa here due to BOOL conflict)
+#ifndef __OBJC__
 class NSWindow;
+#endif // __OBJC__
 
 /* Defined in slplugin-objc.mm: */
 
-- 
cgit v1.2.3


From c43b176584d0fe050ec985f4003471f7b5af4818 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 12 Dec 2014 17:43:09 -0800
Subject: Remove unneeded media plugin header file

---
 indra/llplugin/llpluginclassmedia.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/llplugin')

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 0644d2638c..52626b0302 100755
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -32,8 +32,6 @@
 #include "llpluginclassmedia.h"
 #include "llpluginmessageclasses.h"
 
-#include "llqtwebkit.h"
-
 static int LOW_PRIORITY_TEXTURE_SIZE_DEFAULT = 256;
 
 static int nextPowerOf2( int value )
-- 
cgit v1.2.3


From 27951fa1d40abd8cca679f3192264472469e9364 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 7 Jan 2015 19:45:51 -0500
Subject: First cut at consuming new slplugins autobuild package. The contents
 are extracted, but not yet built into the viewer installer.

---
 indra/llplugin/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llplugin')

diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index 75d89aac78..05fc12e338 100755
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -68,7 +68,7 @@ list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})
 
 add_library (llplugin ${llplugin_SOURCE_FILES})
 
-add_subdirectory(slplugin)
+##add_subdirectory(slplugin)
 
 # Add tests
 if (LL_TESTS)
-- 
cgit v1.2.3