diff options
| author | callum_linden <none@none> | 2016-06-02 18:24:15 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-06-02 18:24:15 -0700 |
| commit | 53cc5ba2256af3f70fc9aa69e06a1db0e195079b (patch) | |
| tree | 652ac5f8ae2ace767b971f9cacb98fc78f73ba68 /indra | |
| parent | a24e24fb50e2bbf0a73ccd53ff2ba64124dabeba (diff) | |
FIX MAINT-6748 content looks correct but page links are flipped vertically
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 84fe83408f..be16ff7946 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -597,6 +597,8 @@ void MediaPluginCEF::receiveMessage(const char* message_string) S32 x = message_in.getValueS32("x"); S32 y = message_in.getValueS32("y"); + y = mHeight - y; + // only even send left mouse button events to LLCEFLib // (partially prompted by crash in OS X CEF when sending right button events) // we catch the right click in viewer and display our own context menu anyway diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 9cf3249983..08c927483f 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]); } |