diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:26:12 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:26:12 -0400 |
commit | b68d1a0f50c073257fb48692b666bb692d0c9981 (patch) | |
tree | 46ca2d8a49a2fd8dc3d98db6da926faf84c31b8a /indra/llwindow/llwindowheadless.cpp | |
parent | 6715603b6a991f822274b000e5d8fb9b8d405464 (diff) | |
parent | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (diff) |
Merge viewer-pre-beta -> seraph-viewer-pre-beta
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); } |