diff options
author | Armin Weatherwax | 2010-02-26 17:06:16 +0100 |
---|---|---|
committer | Armin Weatherwax | 2010-09-23 15:40:22 +0200 |
commit | dcdfa1ebab37dd78282bc95093a5f347f5846b1c (patch) | |
tree | 22d6ea3f35b749e51ae4ac882bd56f42d35f9590 /linden/indra/llwindow/llwindowwin32.h | |
parent | remove deprecated files (diff) | |
download | meta-impy-dcdfa1ebab37dd78282bc95093a5f347f5846b1c.zip meta-impy-dcdfa1ebab37dd78282bc95093a5f347f5846b1c.tar.gz meta-impy-dcdfa1ebab37dd78282bc95093a5f347f5846b1c.tar.bz2 meta-impy-dcdfa1ebab37dd78282bc95093a5f347f5846b1c.tar.xz |
port SG2.0 Mediaplugs (webkit supports flash now)
Diffstat (limited to 'linden/indra/llwindow/llwindowwin32.h')
-rw-r--r-- | linden/indra/llwindow/llwindowwin32.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h index cc95993..0e40115 100644 --- a/linden/indra/llwindow/llwindowwin32.h +++ b/linden/indra/llwindow/llwindowwin32.h | |||
@@ -128,7 +128,7 @@ protected: | |||
128 | HCURSOR loadColorCursor(LPCTSTR name); | 128 | HCURSOR loadColorCursor(LPCTSTR name); |
129 | BOOL isValid(); | 129 | BOOL isValid(); |
130 | void moveWindow(const LLCoordScreen& position,const LLCoordScreen& size); | 130 | void moveWindow(const LLCoordScreen& position,const LLCoordScreen& size); |
131 | 131 | LLSD getNativeKeyData(); | |
132 | 132 | ||
133 | // Changes display resolution. Returns true if successful | 133 | // Changes display resolution. Returns true if successful |
134 | BOOL setDisplayResolution(S32 width, S32 height, S32 bits, S32 refresh); | 134 | BOOL setDisplayResolution(S32 width, S32 height, S32 bits, S32 refresh); |
@@ -208,6 +208,12 @@ protected: | |||
208 | 208 | ||
209 | LLPreeditor *mPreeditor; | 209 | LLPreeditor *mPreeditor; |
210 | 210 | ||
211 | |||
212 | |||
213 | U32 mKeyCharCode; | ||
214 | U32 mKeyScanCode; | ||
215 | U32 mKeyVirtualKey; | ||
216 | |||
211 | friend class LLWindowManager; | 217 | friend class LLWindowManager; |
212 | }; | 218 | }; |
213 | 219 | ||