diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:23:39 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:23:39 -0400 |
commit | 38306a2bbbcaaa0825db88aab39f7d10943f9af3 (patch) | |
tree | ab5f360c6537510303da006a7678124c3134613b /indra/llwindow/llwindow.cpp | |
parent | 6715603b6a991f822274b000e5d8fb9b8d405464 (diff) | |
parent | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (diff) |
automated merge viewer-pre-beta -> seraph-viewer-pre-beta
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
-rw-r--r-- | indra/llwindow/llwindow.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 072f694c24..71a5df910d 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -41,6 +41,8 @@ #include "llkeyboard.h" #include "linked_lists.h" #include "llwindowcallbacks.h" +#include "llwindowlistener.h" +#include <boost/lambda/core.hpp> // @@ -115,10 +117,19 @@ LLWindow::LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags) mHideCursorPermanent(FALSE), mFlags(flags), mHighSurrogate(0) -{ } +{ + // gKeyboard is still NULL, so it doesn't do LLWindowListener any good to + // pass its value right now. Instead, pass it a nullary function that + // will, when we later need it, return the value of gKeyboard. + // boost::lambda::var() constructs such a functor on the fly. + mListener = new LLWindowListener(callbacks, boost::lambda::var(gKeyboard)); +} LLWindow::~LLWindow() -{ } +{ + delete mListener; + mListener = NULL; +} //virtual BOOL LLWindow::isValid() |