From 989379b09b90347bb97fb4a24688002cf11c0aa7 Mon Sep 17 00:00:00 2001 From: Callum Linden Date: Fri, 22 Jul 2016 13:56:26 -0700 Subject: More Y flip madness - 2D media on OS X is has flipped Y mouse coords but correct on 3D/MOAP - reluctantly adding per platform switch --- indra/newview/llmediactrl.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra') diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 9cf3249983..5fed925dda 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -907,7 +907,14 @@ void LLMediaCtrl::convertInputCoords(S32& x, S32& y) if(mMediaSource && mMediaSource->hasMedia()) { +// on OS X (maybe Linux) and on 2D media like login/search, the coords are wrong. +// they are fine on 3D media - so we flip (or is it unflip) them here for anything +// except windows (Which appears to be correct on both counts) +#if LL_WINDOWS coords_opengl = mMediaSource->getMediaPlugin()->getTextureCoordsOpenGL(); +#else + coords_opengl = ! mMediaSource->getMediaPlugin()->getTextureCoordsOpenGL(); +#endif } x = ll_round((F32)x * LLUI::getScaleFactor().mV[VX]); -- cgit v1.2.3