diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-02-21 15:44:16 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-02-21 15:44:16 -0500 |
| commit | dbaef6ef1fa6461373cd7117f20f5b8fd4e8db6c (patch) | |
| tree | 3d02f98489fd74488b38cdef80d327b9e24233fd /indra/llwindow/llwindow.cpp | |
| parent | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (diff) | |
| parent | 25d754c26b8ee749b805d5fa0d1b0d7971756a4b (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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() |