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/llwindowwin32.h | |
| parent | d7277171c359ac66f4a75c80fc43c532018baece (diff) | |
| parent | 8b0ae67e73a82940d3e7004eb17081a8ca4b8594 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llwindow/llwindowwin32.h')
| -rw-r--r-- | indra/llwindow/llwindowwin32.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index 6aca31b63e..9d57735772 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -132,7 +132,7 @@ protected: HCURSOR loadColorCursor(LPCTSTR name); BOOL isValid(); void moveWindow(const LLCoordScreen& position,const LLCoordScreen& size); - + LLSD getNativeKeyData(); // Changes display resolution. Returns true if successful BOOL setDisplayResolution(S32 width, S32 height, S32 bits, S32 refresh); @@ -211,6 +211,10 @@ protected: LLDragDropWin32* mDragDrop; + U32 mKeyCharCode; + U32 mKeyScanCode; + U32 mKeyVirtualKey; + friend class LLWindowManager; }; |