summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindow.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-03-01 02:13:55 +0000
committerDon Kjer <don@lindenlab.com>2011-03-01 02:13:55 +0000
commit627c28da811f00ddd02a5c2af0762f427ac02a1b (patch)
tree13e1deab87b9a3c56595b796bd17347e47a93658 /indra/llwindow/llwindow.cpp
parentf2764d24a3b3563d66a683c84af22b61648755cb (diff)
parent0929315ab103433275a71f26a4900ee0615932e9 (diff)
Merge with viewer-headless
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
-rw-r--r--indra/llwindow/llwindow.cpp10
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()