diff options
author | Andrew Dyukov <adyukov@productengine.com> | 2009-10-26 19:33:38 +0200 |
---|---|---|
committer | Andrew Dyukov <adyukov@productengine.com> | 2009-10-26 19:33:38 +0200 |
commit | 33c1be212afb3cf36a80c1fadb6aa9e55670c8ff (patch) | |
tree | 781b568c805c82c152bc4808b747eaaec92419da /indra/newview/llchannelmanager.cpp | |
parent | ff37134a405e81899b4d9e7d07be7e3da85c8278 (diff) | |
parent | 1d4d4fec00aacb1e1e00a4f60a6af4d8ed3b8bde (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llchannelmanager.cpp')
-rw-r--r-- | indra/newview/llchannelmanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp index 77f941eef0..6427422572 100644 --- a/indra/newview/llchannelmanager.cpp +++ b/indra/newview/llchannelmanager.cpp @@ -40,6 +40,8 @@ #include "llbottomtray.h" #include "llviewerwindow.h" #include "llrootview.h" +#include "llsyswellwindow.h" +#include "llfloaterreg.h" #include <algorithm> @@ -128,7 +130,7 @@ void LLChannelManager::onLoginCompleted() S32 channel_right_bound = gViewerWindow->getWorldViewRect().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth"); mStartUpChannel->init(channel_right_bound - channel_width, channel_right_bound); - mStartUpChannel->setShowToasts(true); + mStartUpChannel->setMouseDownCallback(boost::bind(&LLSysWellWindow::onStartUpToastClick, LLFloaterReg::getTypedInstance<LLSysWellWindow>("syswell_window"), _2, _3, _4)); mStartUpChannel->setCommitCallback(boost::bind(&LLChannelManager::onStartUpToastClose, this)); mStartUpChannel->createStartUpToast(away_notifications, gSavedSettings.getS32("StartUpToastLifeTime")); |