diff options
author | Rider Linden <rider@lindenlab.com> | 2015-10-27 15:45:21 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-10-27 15:45:21 -0700 |
commit | b1c3ec9c0049758afbe9e13d31cc2f60348ecffb (patch) | |
tree | 9da64a10bee7c90ac671db21df68b9e78ca72c7c /indra/newview/llchannelmanager.cpp | |
parent | 9833a50260fb45d5f0033200ae756834c0cc9940 (diff) | |
parent | 4ee02ce01a220aaf63f10c2a00556b13c7892de3 (diff) |
Merge
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")); |