diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-02-05 18:38:16 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-05 18:38:16 -0800 |
| commit | 3699be5c4571904f6f0042112515a2cc23b375bf (patch) | |
| tree | 93d415952bdf853ca9971d777fcf9e15371c572d /indra/llwindow/llwindowmacosx.h | |
| parent | d7277171c359ac66f4a75c80fc43c532018baece (diff) | |
| parent | 8b0ae67e73a82940d3e7004eb17081a8ca4b8594 (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 377f10b6d4..7c6b324029 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -120,6 +120,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, @@ -218,6 +222,7 @@ protected: friend class LLWindowManager; static WindowRef sMediaWindow; + EventRef mRawKeyEvent; }; |