diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-05 18:02:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-05 18:02:58 -0400 |
| commit | 5f38ec7f92fcea833352cd30797a9d73ef5a041f (patch) | |
| tree | 67a35e5cd822b9f630dd72fdc93e4a3749f92735 /indra/newview/llviewerwindow.cpp | |
| parent | 194bedbb96a6dcfe90d5b731aeca8658c83f2306 (diff) | |
| parent | 30480b58db917e48090ae7b3c1427834875d9626 (diff) | |
merge changes for storm-1637
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index a7f4209e69..98ae746ca7 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -36,6 +36,7 @@ #include <iostream> #include <fstream> #include <algorithm> +#include <boost/lambda/core.hpp> #include "llagent.h" #include "llagentcamera.h" @@ -198,6 +199,7 @@ #include "llfloaternotificationsconsole.h" #include "llnearbychat.h" +#include "llwindowlistener.h" #include "llviewerwindowlistener.h" #include "llpaneltopinfobar.h" @@ -1547,7 +1549,12 @@ LLViewerWindow::LLViewerWindow( mResDirty(false), mStatesDirty(false), mCurrResolutionIndex(0), - mViewerWindowListener(new LLViewerWindowListener(this)), + // 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. + mWindowListener(new LLWindowListener(this, boost::lambda::var(gKeyboard))), + mViewerWindowListener(new LLViewerWindowListener(this)), mProgressView(NULL) { LLNotificationChannel::buildChannel("VW_alerts", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alert")); |