diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-01-29 14:49:18 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-01-29 14:49:18 -0800 |
| commit | a4aed31ad9fd1874b134af87145ec93b283dbbfb (patch) | |
| tree | 1ef9f6404b1c2e676b8d8308ecf5983a44a38f0a /indra/llwindow/llwindowmacosx.h | |
| parent | 5a478a14ea37e48830e41ef4a93ec846f84d4a94 (diff) | |
| parent | 572b8fc518ee45cdf5403f58b18e0000868696cb (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index fbfa07fab4..7f27c64712 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -119,6 +119,10 @@ public: static std::vector<std::string> getDynamicFallbackFontList(); + // Provide native key event data + /*virtual*/ LLSD getNativeKeyData(); + + protected: LLWindowMacOSX(LLWindowCallbacks* callbacks, const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags, @@ -208,6 +212,7 @@ protected: friend class LLWindowManager; static WindowRef sMediaWindow; + EventRef mRawKeyEvent; }; |