summaryrefslogtreecommitdiff
path: root/indra/newview/llmediactrl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
-rw-r--r--indra/newview/llmediactrl.cpp7
1 files changed, 7 insertions, 0 deletions
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]);