diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:09:11 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:09:11 +0200 |
| commit | 30c381406c4891cce439c66ca17b26247f0a698c (patch) | |
| tree | 2196833344c813e2d6bf4b963adc517c30050697 /indra/llwindow/llwindowmacosx-objc.h | |
| parent | 764788c9bc549715aed119c639ac919067f38a92 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-530-maint
# Conflicts:
# doc/contributions.txt
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); |