diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-07-01 18:51:24 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-07-01 18:51:24 -0400 |
| commit | 7e35f971442e5667c0f8732db31a8b8189f0f9f4 (patch) | |
| tree | 6437555bfd521e02f95128c70d891adc1349d814 /indra/newview/llviewerwindow.cpp | |
| parent | e17078810b4d1dbf11a13e9c4991451c85492856 (diff) | |
| parent | f68d3de9495d4a23a66ae61b1985e07694db4708 (diff) | |
Merged in backout of setSetting listener.
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 5c9f8af216..dcd37d85da 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -30,6 +30,10 @@ * $/LicenseInfo$ */ +#if defined(LL_WINDOWS) +#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally +#endif + #include "llviewerprecompiledheaders.h" // system library includes @@ -189,6 +193,7 @@ #include "llfloaternotificationsconsole.h" #include "llnearbychathistory.h" +#include "llviewerwindowlistener.h" #if LL_WINDOWS #include <tchar.h> // For Unicode conversion methods @@ -1262,7 +1267,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")); |