diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-02-01 22:14:44 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-02-01 22:14:44 +0200 |
commit | 185082f1bbedbe9d5a17f1ee1b85693c2bc990d9 (patch) | |
tree | b60ca5d437a0fe8bfe0fe0d600dd4bf49914f259 /indra/llwindow/llwindowwin32.h | |
parent | eb042c2365a308c65ac3844c01741b0957bd3e1e (diff) | |
parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) |
Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
# indra/newview/llappviewer.cpp
Diffstat (limited to 'indra/llwindow/llwindowwin32.h')
-rw-r--r-- | indra/llwindow/llwindowwin32.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index 9cd16eb993..ee0df570e9 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -116,6 +116,9 @@ public: static std::vector<std::string> getDynamicFallbackFontList(); static void setDPIAwareness(); + + /*virtual*/ void* getDirectInput8(); + /*virtual*/ bool getInputDevices(U32 device_type_filter, void * di8_devices_callback, void* userdata); protected: LLWindowWin32(LLWindowCallbacks* callbacks, const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags, |