diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-18 10:07:40 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-18 10:07:40 -0400 |
commit | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (patch) | |
tree | 3916874ed180ee9567b4fb76d88d8ce72689c257 /indra/llwindow/llwindowheadless.cpp | |
parent | d534c8009f2573400a21c19b00691536fc3cc23f (diff) | |
parent | b8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff) |
merged from 2.6.4-start tag in viewer-development
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); } |