diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-04-29 18:23:44 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-04-29 18:23:44 +0000 |
| commit | 5e757b2841941e8e5a9b918dbae4fd7b36a84896 (patch) | |
| tree | deee2618a9c33681e038845605db6719babd1d77 /indra/llwindow/llwindowwin32.h | |
| parent | 18316191cd7d1e1f8c3a4940eb5ed6cdf2695575 (diff) | |
| parent | 2386125ae0db3218c620667b05449cd25ee05ad5 (diff) | |
Merged in DV525-merge-6.4.19 (pull request #559)
DRTVWR-525 merge up to 6.4.19
Diffstat (limited to 'indra/llwindow/llwindowwin32.h')
| -rw-r--r-- | indra/llwindow/llwindowwin32.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index ee0df570e9..0b3d14fb16 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -114,6 +114,7 @@ public: LLWindowCallbacks::DragNDropResult completeDragNDropRequest( const LLCoordGL gl_coord, const MASK mask, LLWindowCallbacks::DragNDropAction action, const std::string url ); + static std::vector<std::string> getDisplaysResolutionList(); static std::vector<std::string> getDynamicFallbackFontList(); static void setDPIAwareness(); |