summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2016-07-25 12:09:55 -0700
committerCallum Prentice <callum@lindenlab.com>2016-07-25 12:09:55 -0700
commit19640c015ecfefde767be49168684b27f5ceabb2 (patch)
tree66ce5218ab7d7141bbb748345c3538a49e82a56b /indra/newview
parent6f09cf76cd79108fcdc213f1f945540f08442c5d (diff)
Remove unncessary Y flip
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmediactrl.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 5fed925dda..9cf3249983 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -907,14 +907,7 @@ 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]);