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/newview/llmediactrl.cpp | |
| parent | bea18c933bd97b838644f0d1738c633495b6b102 (diff) | |
| parent | 19640c015ecfefde767be49168684b27f5ceabb2 (diff) | |
merge callums latest changes
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 08c927483f..9cf3249983 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -911,7 +911,7 @@ void LLMediaCtrl::convertInputCoords(S32& x, S32& y) } x = ll_round((F32)x * LLUI::getScaleFactor().mV[VX]); - if ( coords_opengl ) + if ( ! coords_opengl ) { y = ll_round((F32)(y) * LLUI::getScaleFactor().mV[VY]); } |