diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2016-03-29 13:30:00 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2016-03-29 13:30:00 +0300 |
| commit | 272d40a0892108de5e54f8b440f95e4c270686a7 (patch) | |
| tree | 8286027e8fd2b61e92219dc17f519324993bbcc1 /indra/llwindow/llwindowmacosx.cpp | |
| parent | d9545003ed3b4f28d10ccee6939831ff7d74b53f (diff) | |
MAINT-6239 [Mac] Computer cursor appears attached to crosshair after using modifier keys in mouselook
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rwxr-xr-x | indra/llwindow/llwindowmacosx.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 8cbf5a31fb..c6bf93507a 100755 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -1457,8 +1457,16 @@ void LLWindowMacOSX::updateCursor() mNextCursor = UI_CURSOR_WORKING; } - if(mCurrentCursor == mNextCursor) - return; + if(mCurrentCursor == mNextCursor) + { + if(mCursorHidden && isCGCursorVisible()) + { + hideNSCursor(); + mHideCursorPermanent = TRUE; + adjustCursorDecouple(); + } + return; + } // RN: replace multi-drag cursors with single versions if (mNextCursor == UI_CURSOR_ARROWDRAGMULTI) |