diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 17:51:28 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 17:51:28 -0700 |
| commit | 50247533f99f374be71728cc5ca00f0444189a9f (patch) | |
| tree | c1505ec3ec9c054447fb98968c9299e502857000 /indra/newview/llviewerwindow.cpp | |
| parent | 146e084af3344ada737340115c5fa063c0aab6b3 (diff) | |
| parent | d885db79f94ee3d6a2b4ed7febe7beb69d0c7d51 (diff) | |
Merged latest viewer/login-api with latest viewer/viewer-20
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 24d00cba16..603e02dbc8 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -32,6 +32,10 @@ #include "llviewerprecompiledheaders.h" +#if LL_WINDOWS +#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally +#endif + // system library includes #include <stdio.h> #include <iostream> @@ -195,6 +199,7 @@ #include "llfloaternotificationsconsole.h" #include "llnearbychat.h" +#include "llviewerwindowlistener.h" #if LL_WINDOWS #include <tchar.h> // For Unicode conversion methods @@ -1204,7 +1209,8 @@ LLViewerWindow::LLViewerWindow( mResDirty(false), mStatesDirty(false), mIsFullscreenChecked(false), - mCurrResolutionIndex(0) + mCurrResolutionIndex(0), + mViewerWindowListener(new LLViewerWindowListener("LLViewerWindow", this)) { LLNotificationChannel::buildChannel("VW_alerts", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alert")); LLNotificationChannel::buildChannel("VW_alertmodal", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alertmodal")); |