diff options
| author | Callum Linden <callum@lindenlab.com> | 2016-07-19 12:42:49 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2016-07-19 12:42:49 -0700 |
| commit | cd47f86c4ab6dd2bdeb98db06acd64d02cdff96f (patch) | |
| tree | 7cbeab1d557dbc0ae810eeec24c5134e4711222a | |
| parent | 0870ee4d74af198fe912e778d5dff359ada9aa77 (diff) | |
MAINT-6578 Add back Y Flip into QuickTime plugin used in OS X to match viewer setting
| -rwxr-xr-x | indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index 6d4c6ca43d..893fb738ce 100755 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -311,9 +311,7 @@ private: 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 ) ); |