diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-04-03 14:53:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-04-03 14:53:49 -0700 |
| commit | 8f1e75071e081f1040a371cb2c1bc420befab948 (patch) | |
| tree | 18958414ed6e245e101de71a4439d2499e9dce80 /indra/llwindow/llwindowmacosx.h | |
| parent | e24237b6af504ff8faea02c8ab22344f2452364e (diff) | |
| parent | 82fbf642617444e0233e73d3bd5909c7c5285445 (diff) | |
Merge
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 9e9bd8ae39..24651027e8 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -112,6 +112,7 @@ public: /*virtual*/ void allowLanguageTextInput(LLPreeditor *preeditor, BOOL b); /*virtual*/ void interruptLanguageTextInput(); /*virtual*/ void spawnWebBrowser(const std::string& escaped_url, bool async); + /*virtual*/ F32 getSystemUISize(); static std::vector<std::string> getDynamicFallbackFontList(); @@ -135,7 +136,7 @@ protected: BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth, U32 fsaa_samples); - ~LLWindowMacOSX(); + ~LLWindowMacOSX(); void initCursors(); BOOL isValid(); |