diff options
author | Don Kjer <don@lindenlab.com> | 2011-02-19 00:17:12 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-02-19 00:17:12 +0000 |
commit | 8330a4d0fd046834a27a988102b439a6ec1f0aa2 (patch) | |
tree | 7fd2227522bf5c2377a45124cb50aad0afb90597 /indra/llwindow/llwindow.cpp | |
parent | 3f5760b5ee4e422e11f3416133b7a4c3a73b1d8c (diff) | |
parent | 18bf5f09b22a2c36ccf543104b1115a7b0b9db71 (diff) |
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
-rw-r--r-- | indra/llwindow/llwindow.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 072f694c24..2d00c37719 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -41,6 +41,7 @@ #include "llkeyboard.h" #include "linked_lists.h" #include "llwindowcallbacks.h" +#include "llwindowlistener.h" // @@ -115,10 +116,15 @@ LLWindow::LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags) mHideCursorPermanent(FALSE), mFlags(flags), mHighSurrogate(0) -{ } +{ + mListener = new LLWindowListener(callbacks, gKeyboard); +} LLWindow::~LLWindow() -{ } +{ + delete mListener; + mListener = NULL; +} //virtual BOOL LLWindow::isValid() |