summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowheadless.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-10 22:40:13 -0400
committerOz Linden <oz@lindenlab.com>2011-04-10 22:40:13 -0400
commitee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (patch)
tree73ffbc468a65c2d4ed4c0dede4e24ad9e7cd69fd /indra/llwindow/llwindowheadless.cpp
parenta248ed2a2ccb89c9716f8657ef3c52269518c909 (diff)
parent60bceb759b592348b403689ffa8ed9c768126f8b (diff)
merge changes for storm-1057
Diffstat (limited to 'indra/llwindow/llwindowheadless.cpp')
-rw-r--r--indra/llwindow/llwindowheadless.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowheadless.cpp b/indra/llwindow/llwindowheadless.cpp
index 35398f1c09..e6e6bc67ff 100644
--- a/indra/llwindow/llwindowheadless.cpp
+++ b/indra/llwindow/llwindowheadless.cpp
@@ -28,6 +28,7 @@
#include "indra_constants.h"
#include "llwindowheadless.h"
+#include "llkeyboardheadless.h"
//
// LLWindowHeadless
@@ -37,6 +38,9 @@ LLWindowHeadless::LLWindowHeadless(LLWindowCallbacks* callbacks, const std::stri
BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth)
: LLWindow(callbacks, fullscreen, flags)
{
+ // Initialize a headless keyboard.
+ gKeyboard = new LLKeyboardHeadless();
+ gKeyboard->setCallbacks(callbacks);
}