diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
| commit | 22193b15b82d1a6f0ce8846d122bf3ddcefbf13e (patch) | |
| tree | c6c2b595b3e6c518bcf5450e56fb470fa5c07dba /indra/llwindow/llwindowwin32.h | |
| parent | f040942f190cfdf10ee577a9b4f6a5c83e752e00 (diff) | |
| parent | 465a3356a2f32362837d5231a21b9151f45f890b (diff) | |
Merge
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; }; |