summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2022-09-21 18:36:49 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2022-09-21 18:36:49 +0300
commit85504f085e556d5f1c5c4fa22ed51ae43046e9c4 (patch)
tree12ff49167f60747d7628dfd5ffbfec62ca772616 /indra/llwindow/llwindowmacosx.cpp
parent856d2a44d196059cf3f487d7facd3c180369bd20 (diff)
parentf83289d3a7e80bebe47f696f96aee1b7e64d1d69 (diff)
Merge branch 'master' into DRTVWR-539
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
-rw-r--r--indra/llwindow/llwindowmacosx.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index b3616e4ea8..66f7e60371 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -1668,7 +1668,7 @@ void LLWindowMacOSX::hideCursor()
void LLWindowMacOSX::showCursor()
{
- if(mCursorHidden)
+ if(mCursorHidden || !isCGCursorVisible())
{
// LL_INFOS() << "showCursor: showing" << LL_ENDL;
mCursorHidden = FALSE;