aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow/llwindowsdl.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llwindow/llwindowsdl.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/linden/indra/llwindow/llwindowsdl.h b/linden/indra/llwindow/llwindowsdl.h
index 39a6007..37b0835 100644
--- a/linden/indra/llwindow/llwindowsdl.h
+++ b/linden/indra/llwindow/llwindowsdl.h
@@ -154,6 +154,8 @@ protected:
154 BOOL ignore_pixel_depth, U32 fsaa_samples); 154 BOOL ignore_pixel_depth, U32 fsaa_samples);
155 ~LLWindowSDL(); 155 ~LLWindowSDL();
156 156
157 /*virtual*/ LLSD getNativeKeyData();
158
157 void initCursors(); 159 void initCursors();
158 void quitCursors(); 160 void quitCursors();
159 BOOL isValid(); 161 BOOL isValid();
@@ -206,12 +208,17 @@ protected:
206 208
207 friend class LLWindowManager; 209 friend class LLWindowManager;
208 210
209#if LL_X11 211
210private: 212private:
213#if LL_X11
211 void x11_set_urgent(BOOL urgent); 214 void x11_set_urgent(BOOL urgent);
212 BOOL mFlashing; 215 BOOL mFlashing;
213 LLTimer mFlashTimer; 216 LLTimer mFlashTimer;
214#endif //LL_X11 217#endif //LL_X11
218 U32 mKeyScanCode;
219 U32 mKeyVirtualKey;
220 SDLMod mKeyModifiers;
221
215}; 222};
216 223
217 224