diff options
| author | skolb <none@none> | 2010-03-08 14:54:54 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2010-03-08 14:54:54 -0800 |
| commit | 78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (patch) | |
| tree | 0c471654bd00737375e91f040d758716c82bffb2 /indra/llwindow/llwindowmacosx.h | |
| parent | f39a87ef8384ede25a6597e678ac7609e9e64cc5 (diff) | |
| parent | 2aa9ecb60235c96a42f3719fab9dbc6ea1bf50db (diff) | |
Local merge
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 7c6b324029..86036a261c 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -123,6 +123,8 @@ public: // Provide native key event data /*virtual*/ LLSD getNativeKeyData(); + static S32 getDisplayWidth(); + static S32 getDisplayHeight(); protected: LLWindowMacOSX(LLWindowCallbacks* callbacks, |