diff options
author | Callum Prentice <callum@lindenlab.com> | 2023-05-02 09:39:03 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2023-05-02 09:39:03 -0700 |
commit | bb96ac2621dd09dbc318d04f7e04ffbc50ec3174 (patch) | |
tree | 9e692dbb89e46faaea656af979b6855502481772 /indra/llwindow/llwindow.h | |
parent | fbf5b199f3bd9775bc992609baf6c093177a70d8 (diff) | |
parent | 7ed52090a67882cd0bc904f1e0a9ce07cf6768e9 (diff) |
MErge with main after Viewer release
Diffstat (limited to 'indra/llwindow/llwindow.h')
-rw-r--r-- | indra/llwindow/llwindow.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index 0edf39f6ef..4380bbdb73 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -196,6 +196,8 @@ public: // windows only DirectInput8 for joysticks virtual void* getDirectInput8() { return NULL; }; virtual bool getInputDevices(U32 device_type_filter, void * devices_callback, void* userdata) { return false; }; + + virtual S32 getRefreshRate() { return mRefreshRate; } protected: LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags); virtual ~LLWindow(); @@ -229,6 +231,7 @@ protected: U16 mHighSurrogate; S32 mMinWindowWidth; S32 mMinWindowHeight; + S32 mRefreshRate; // Handle a UTF-16 encoding unit received from keyboard. // Converting the series of UTF-16 encoding units to UTF-32 data, |