diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:38:16 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:38:16 -0700 |
| commit | e3721fe66e2472eaf6bffd4bf4e2b9ec5edd2506 (patch) | |
| tree | 32f6b6d4fabd10f447a0c950e0bafe7b573e4d9b /indra/llwindow/llwindow.h | |
| parent | 0ccb0306da93fa279909f45131009e80687f2f3d (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-533
Diffstat (limited to 'indra/llwindow/llwindow.h')
| -rw-r--r-- | indra/llwindow/llwindow.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index f1113acd5f..d4d5b76937 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -169,6 +169,8 @@ public: // Get system UI size based on DPI (for 96 DPI UI size should be 1.0) virtual F32 getSystemUISize() { return 1.0; } + static std::vector<std::string> getDisplaysResolutionList(); + // windows only DirectInput8 for joysticks virtual void* getDirectInput8() { return NULL; }; virtual bool getInputDevices(U32 device_type_filter, void * devices_callback, void* userdata) { return false; }; |