Merge branch 'develop' into marchcat/xcode-16

# Conflicts:
#	.github/workflows/build.yaml
#	indra/llmath/raytrace.cpp

1 files changed, 7 insertions, 12 deletions

diff --git a/indra/llwindow/llkeyboardheadless.h b/indra/llwindow/llkeyboardheadless.h
index 439abaf25b..60c4d61e1c 100644
--- a/indra/llwindow/llkeyboardheadless.h
+++ b/indra/llwindow/llkeyboardheadless.h
@@ -33,20 +33,15 @@ class LLKeyboardHeadless : public LLKeyboard
 {
 public:
     LLKeyboardHeadless();
-    /*virtual*/ ~LLKeyboardHeadless() {};
+    ~LLKeyboardHeadless() {};
 
-#ifndef LL_SDL
-    /*virtual*/ bool    handleKeyUp(const U16 key, MASK mask) { return false; }
-    /*virtual*/ bool    handleKeyDown(const U16 key, MASK mask) { return false; }
-#else
-    /*virtual*/ bool    handleKeyUp(const U32 key, MASK mask) { return false; }
-    /*virtual*/ bool    handleKeyDown(const U32 key, MASK mask) { return false; }
-#endif
-    /*virtual*/ void    resetMaskKeys();
-    /*virtual*/ MASK    currentMask(bool for_mouse_event);
-    /*virtual*/ void    scanKeyboard();
+    bool    handleKeyUp(const LLKeyboard::NATIVE_KEY_TYPE key, MASK mask) override;
+    bool    handleKeyDown(const LLKeyboard::NATIVE_KEY_TYPE key, MASK mask) override;
+    void    resetMaskKeys() override;
+    MASK    currentMask(bool for_mouse_event) override;
+    void    scanKeyboard() override;
 #ifdef LL_DARWIN
-    /*virtual*/ void    handleModifier(MASK mask);
+    void    handleModifier(MASK mask) override;
 #endif
 };