diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-07-26 17:49:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-07-26 17:49:41 -0400 |
| commit | 47f2c6bd52a9e929af8ccefa08d11ad18f05602b (patch) | |
| tree | 77d601c23539f576807f3e2cd8a62603b275905d /indra/media_plugins/quicktime/media_plugin_quicktime.cpp | |
| parent | bea18c933bd97b838644f0d1738c633495b6b102 (diff) | |
| parent | 19640c015ecfefde767be49168684b27f5ceabb2 (diff) | |
merge callums latest changes
Diffstat (limited to 'indra/media_plugins/quicktime/media_plugin_quicktime.cpp')
| -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 ) ); |