From 447b85de620dd217cb13233d814de8e80e1b9eb7 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 26 Oct 2010 20:09:25 -0700
Subject: Set LL_GSTREAMER010_ENABLED to true for Linux-only until gstreamer
 loading can be sorted on windows

---
 linden/indra/cmake/GStreamer010Plugin.cmake                           | 2 ++
 .../indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp  | 4 ++--
 linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
index cafcd4c..878d3c0 100644
--- a/linden/indra/cmake/GStreamer010Plugin.cmake
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -8,6 +8,7 @@ if (STANDALONE)
   pkg_check_modules(GSTREAMER010_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
 endif (STANDALONE)
 
+if (LINUX)
   use_prebuilt_binary(gstreamer)
   # possible libxml should have its own .cmake file instead
   use_prebuilt_binary(libxml)
@@ -18,6 +19,7 @@ endif (STANDALONE)
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
       )
+endif (LINUX)
       
 if (WINDOWS)
   # We don't need to explicitly link against gstreamer itself, because
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
index 1fee545..e194bf7 100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
@@ -33,7 +33,7 @@
  * @endcond
  */
 
-///#if LL_GSTREAMER010_ENABLED
+#if LL_GSTREAMER010_ENABLED
 
 #include "linden_common.h"
 
@@ -569,4 +569,4 @@ void gst_slvideo_init_class (void)
 	                            (const gchar *)"http://www.secondlife.com/" );
 }
 
-///#endif // LL_GSTREAMER010_ENABLED
+#endif // LL_GSTREAMER010_ENABLED
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
index 0ad8cf1..5e8c72c 100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
@@ -36,7 +36,7 @@
 #ifndef __GST_SLVIDEO_H__
 #define __GST_SLVIDEO_H__
 
-///#if LL_GSTREAMER010_ENABLED
+#if LL_GSTREAMER010_ENABLED
 
 extern "C" {
 #include <gst/gst.h>
@@ -108,6 +108,6 @@ void gst_slvideo_init_class (void);
 
 G_END_DECLS
 
-///#endif // LL_GSTREAMER010_ENABLED
+#endif // LL_GSTREAMER010_ENABLED
 
 #endif /* __GST_SLVIDEO_H__ */
-- 
cgit v1.1