diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:57 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:57 -0400 |
commit | 0c05c8c89632d2747ca8b364ff663d1d5505fb4d (patch) | |
tree | 9f01f2c772212fcad555176a272265b5b4d67b09 /indra/llwindow/llwindowheadless.cpp | |
parent | dff83a1ba0592049ccdcd31177c183d62df65e85 (diff) | |
parent | ee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (diff) |
merge changes for storm-1117
Diffstat (limited to 'indra/llwindow/llwindowheadless.cpp')
-rw-r--r-- | indra/llwindow/llwindowheadless.cpp | 4 |
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); } |