diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-02 22:19:20 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-02 22:19:20 +0300 |
| commit | 64341c8b1907f8526b93a6b3d3d124924d44c2d9 (patch) | |
| tree | 8b7647bb5fa02612405ec0e05b88cc303f429e3d /indra/llwindow/llwindowmacosx.h | |
| parent | 8ec6aba9c06bb8e5b9454b350a6947a1d8c16179 (diff) | |
| parent | 5cf18cb867be567bf921f0b94a78fd822e4112ad (diff) | |
Merged in lindenlab/viewer-release
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(); |