diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-08-14 09:11:23 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-08-14 09:11:23 -0700 |
| commit | ed7fda069bcbf145a273b46cb2070c72d059acef (patch) | |
| tree | bddfc8f9a13d55ccb05c4a24bb3022c84197bf25 /indra/llui | |
| parent | f03b696c3dfd859cf92db27ae7c45248d0bf8d44 (diff) | |
| parent | e9ead7cc2ee9970b468ef6de0ba57726bb203ef4 (diff) | |
Merge viewer-release 6.2.5
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index e9f8ba020e..52190a1473 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -236,14 +236,14 @@ void LLUI::dirtyRect(LLRect rect) //static void LLUI::setMousePositionScreen(S32 x, S32 y) { - S32 screen_x, screen_y; #if defined(LL_DARWIN) - screen_x = ll_round((F32)x); - screen_y = ll_round((F32)y); + S32 screen_x = ll_round(((F32)x * getScaleFactor().mV[VX]) / LLView::getWindow()->getSystemUISize()); + S32 screen_y = ll_round(((F32)y * getScaleFactor().mV[VY]) / LLView::getWindow()->getSystemUISize()); #else - screen_x = ll_round((F32)x * getScaleFactor().mV[VX]); - screen_y = ll_round((F32)y * getScaleFactor().mV[VY]); + S32 screen_x = ll_round((F32)x * getScaleFactor().mV[VX]); + S32 screen_y = ll_round((F32)y * getScaleFactor().mV[VY]); #endif + LLView::getWindow()->setCursorPosition(LLCoordGL(screen_x, screen_y).convert()); } |