diff options
| author | Don Kjer <don@lindenlab.com> | 2011-03-23 01:34:26 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-03-23 01:34:26 +0000 |
| commit | bdaaa6de1384a39de5a452729bebea49d8242a67 (patch) | |
| tree | 052550a07fdda090c05ebbbdb9ecc8936563161a /indra/llwindow/llwindow.cpp | |
| parent | 1e0608ff51efc69a14010f2ce5dba3acabe16e49 (diff) | |
| parent | fa4359e571fb67aca651efc3403274cdf0bb2616 (diff) | |
Merge with https://hg.lindenlab.com/nat/viewer-eventapi2
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 2d00c37719..71a5df910d 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -42,6 +42,7 @@ #include "linked_lists.h" #include "llwindowcallbacks.h" #include "llwindowlistener.h" +#include <boost/lambda/core.hpp> // @@ -117,7 +118,11 @@ LLWindow::LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags) mFlags(flags), mHighSurrogate(0) { - mListener = new LLWindowListener(callbacks, gKeyboard); + // 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() |