summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-12-09 21:29:01 +0800
committerErik Kundiman <erik@megapahit.org>2023-12-09 21:29:01 +0800
commit118ee38f9a0406af5d800ee05fdc5cf87e78081b (patch)
tree33eed2b0b5b5aa4e47dd0261560cd54b894ba5a8 /indra/llwindow
parent07d5175489a3adbca6e9549e890ebf957dd6e638 (diff)
Revive Command modifier on macOS
Diffstat (limited to 'indra/llwindow')
-rw-r--r--indra/llwindow/llkeyboardsdl.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/llwindow/llkeyboardsdl.cpp b/indra/llwindow/llkeyboardsdl.cpp
index 872b58e2ec..d7c6656df8 100644
--- a/indra/llwindow/llkeyboardsdl.cpp
+++ b/indra/llwindow/llkeyboardsdl.cpp
@@ -165,7 +165,11 @@ void LLKeyboardSDL::resetMaskKeys()
mKeyLevel[KEY_SHIFT] = TRUE;
}
- if(mask & KMOD_CTRL)
+ if(mask & (KMOD_CTRL
+#ifdef LL_DARWIN
+ | KMOD_GUI
+#endif
+ ))
{
mKeyLevel[KEY_CONTROL] = TRUE;
}
@@ -187,7 +191,11 @@ MASK LLKeyboardSDL::updateModifiers(const U32 mask)
out_mask |= MASK_SHIFT;
}
- if(mask & KMOD_CTRL)
+ if(mask & (KMOD_CTRL
+#ifdef LL_DARWIN
+ | KMOD_GUI
+#endif
+ ))
{
out_mask |= MASK_CONTROL;
}