diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-06 07:32:56 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-06 07:32:56 -0400 |
commit | f41cbc0ac85ae328f2701aab23e94c0ef7ab5758 (patch) | |
tree | c0593e4d79918dc10173de5d3dfbb34e8c2ed40e /indra/llwindow/llwindowheadless.cpp | |
parent | 85c97c19347c1409f8f7231940b0b8f3a57fc0a5 (diff) | |
parent | b5c834c6fdcee7d7238bebfc561ecee3ecca3589 (diff) |
merge changes for storm-1094
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); } |