summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindow.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-09 16:33:58 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-09 16:33:58 +0000
commitd1efc0fd52c0e5dc59951f50435e121305fe9b69 (patch)
tree7ac48a54efc4029b44a6743b08d351ecfd947801 /indra/llwindow/llwindow.h
parent4d9bcc2c8f303464c3664a0a7304a1bc2d658e2e (diff)
parentc9b27bec33d601330afe854d0322d22fce9da76a (diff)
merge from viewer2 trunk.
Diffstat (limited to 'indra/llwindow/llwindow.h')
-rw-r--r--indra/llwindow/llwindow.h4
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);