diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-27 08:00:28 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-27 08:00:28 +0200 |
| commit | 7f39e2583ffffee5866663ebf8798f393fc67570 (patch) | |
| tree | 0babf6af77d62b9408d059813d4ff81df7ff75d5 /indra/newview/llchannelmanager.cpp | |
| parent | cf53c157fe46eb02568101a51c43a41ee2a4cd18 (diff) | |
| parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) | |
Merge downstream, version 3.8.7
Diffstat (limited to 'indra/newview/llchannelmanager.cpp')
| -rwxr-xr-x | indra/newview/llchannelmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp index b0537a83f1..d6240838b6 100755 --- a/indra/newview/llchannelmanager.cpp +++ b/indra/newview/llchannelmanager.cpp @@ -35,6 +35,7 @@ #include "llviewerwindow.h" #include "llrootview.h" #include "llsyswellwindow.h" +#include "llfloaternotificationstabbed.h" #include "llfloaterreg.h" #include <algorithm> @@ -131,7 +132,7 @@ void LLChannelManager::onLoginCompleted() S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth"); mStartUpChannel->init(channel_right_bound - channel_width, channel_right_bound); - mStartUpChannel->setMouseDownCallback(boost::bind(&LLNotificationWellWindow::onStartUpToastClick, LLNotificationWellWindow::getInstance(), _2, _3, _4)); + mStartUpChannel->setMouseDownCallback(boost::bind(&LLFloaterNotificationsTabbed::onStartUpToastClick, LLFloaterNotificationsTabbed::getInstance(), _2, _3, _4)); mStartUpChannel->setCommitCallback(boost::bind(&LLChannelManager::onStartUpToastClose, this)); mStartUpChannel->createStartUpToast(away_notifications, gSavedSettings.getS32("StartUpToastLifeTime")); |