1 files changed, 13 insertions, 2 deletions

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 5d4d553..98d6459 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -30,15 +30,26 @@
  * $/LicenseInfo$
  */
 
-#include "llmediaimplgstreamer.h"
-
 ///#if LL_GSTREAMER_ENABLED
 
+#if LL_WINDOWS
+        // GStreamer 0.10.22 - gstutils.h - conversion from 'guint64' to 'guint8'. 
+        // This was an intentional change to make GStreamer more threadsafe, and
+        // is okay. Delete this bit if GStreamer ever gets more VS-friendly -- McCabe
+        #pragma warning(disable : 4244)
+#endif
+
+#include "llmediaimplgstreamer.h"
+
 extern "C" {
 #include <gst/gst.h>
 #include <gst/gstelement.h>
 }
 
+#if LL_WINDOWS
+        #pragma warning(default : 4244)
+#endif
+
 #include "llmediamanager.h"
 #include "llmediaimplregister.h"