diff options
| author | Richard Linden <none@none> | 2011-10-15 18:14:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-15 18:14:49 -0700 |
| commit | 4aed73ceb18c656e0f36c91bd0efb9a705341629 (patch) | |
| tree | 013b1382be366aa2a9d1caf7bb563e04f7d8b2ed /indra/llwindow/llwindow.cpp | |
| parent | 7c2f2b526ad2b33f1e25378b5a05379de6aa0b5a (diff) | |
| parent | 62d9db2f21b2a6fb579e8f7631a4e387cc5e5b29 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 71a5df910d..dc3a1099b1 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -41,8 +41,6 @@ #include "llkeyboard.h" #include "linked_lists.h" #include "llwindowcallbacks.h" -#include "llwindowlistener.h" -#include <boost/lambda/core.hpp> // @@ -118,17 +116,10 @@ LLWindow::LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags) 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 |