diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-11-16 11:44:55 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-11-16 11:44:55 -0700 |
commit | 353329c2c2e9e8fa1ff273de2016c9e155585f45 (patch) | |
tree | f5098b9532f6d7b757b9a8fb345e7aa5e7e69108 /indra/llwindow/llwindowmacosx-objc.h | |
parent | e95b7efd0b4469ce18bce3bc0261ecc9be06ea9c (diff) | |
parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) |
DRTVWR-546 merge in master v6.5.1
Diffstat (limited to 'indra/llwindow/llwindowmacosx-objc.h')
-rw-r--r-- | indra/llwindow/llwindowmacosx-objc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h index 44fd4127ce..43edc0110d 100644 --- a/indra/llwindow/llwindowmacosx-objc.h +++ b/indra/llwindow/llwindowmacosx-objc.h @@ -131,7 +131,7 @@ void setupInputWindow(NSWindowRef window, GLViewRef view); // These are all implemented in llwindowmacosx.cpp. // This is largely for easier interop between Obj-C and C++ (at least in the viewer's case due to the BOOL vs. BOOL conflict) bool callKeyUp(NSKeyEventRef event, unsigned short key, unsigned int mask); -bool callKeyDown(NSKeyEventRef event, unsigned short key, unsigned int mask); +bool callKeyDown(NSKeyEventRef event, unsigned short key, unsigned int mask, wchar_t character); void callResetKeys(); bool callUnicodeCallback(wchar_t character, unsigned int mask); void callRightMouseDown(float *pos, unsigned int mask); |