From cd47f86c4ab6dd2bdeb98db06acd64d02cdff96f Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Tue, 19 Jul 2016 12:42:49 -0700
Subject: [PATCH] MAINT-6578 Add back Y Flip into QuickTime plugin used in OS X
 to match viewer setting

---
 indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
index 6d4c6ca43d5..893fb738ceb 100755
--- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
+++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
@@ -311,9 +311,7 @@ class MediaPluginQuickTime : public MediaPluginBase
 			MatrixRecord transform;
 			SetIdentityMatrix( &transform );	// transforms are additive so start from identify matrix
 			double scaleX = (double) mWidth / mNaturalWidth;
-
-            // 2016-05-31 CP remove local flip (via -1.0) since texture coods for media on a prim are now flipped for VLC/CEF
-			double scaleY = 1.0 * (double) mHeight / mNaturalHeight;
+			double scaleY = -1.0 * (double) mHeight / mNaturalHeight;
 			double centerX = mWidth / 2.0;
 			double centerY = mHeight / 2.0;
 			ScaleMatrix( &transform, X2Fix( scaleX ), X2Fix( scaleY ), X2Fix( centerX ), X2Fix( centerY ) );
-- 
GitLab