summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowheadless.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-10 22:19:11 -0400
committerOz Linden <oz@lindenlab.com>2011-04-10 22:19:11 -0400
commitc77fcfb7a8aeb2f271b050171bf0d6a9bd4c955b (patch)
treed30164242aa4af36f721033eb7a93fb2f2198de4 /indra/llwindow/llwindowheadless.cpp
parentf1b1dbaba54ce678e6ec5311d4b50ded3f91d58c (diff)
parente0adaa188ba06b6d3f3282121d149193de87c6e6 (diff)
merge changes for storm-250
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);
}