diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-02-08 18:17:15 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-08 18:17:15 -0800 |
| commit | bf2273d0adce6aae0a8c93f74d5cafe32e341674 (patch) | |
| tree | b19456ead3b12f23842ff48ea51a11ad625946ea /indra/llwindow/llwindow.h | |
| parent | 41da63f5e665d793d328e52973cb4de63d3da6a0 (diff) | |
| parent | d321c6aa98c27931a4d141953ce86c23baa7162b (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llwindow/llwindow.h')
| -rw-r--r-- | indra/llwindow/llwindow.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index 127dbf45e0..55b221e716 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -37,6 +37,7 @@ #include "llcoord.h" #include "llstring.h" #include "llcursortypes.h" +#include "llsd.h" class LLSplashScreen; class LLPreeditor; @@ -162,6 +163,9 @@ public: virtual void spawnWebBrowser(const std::string& escaped_url) {}; static std::vector<std::string> getDynamicFallbackFontList(); + + // Provide native key event data + virtual LLSD getNativeKeyData() { return LLSD::emptyMap(); } protected: LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags); |