diff options
author | callum_linden <none@none> | 2015-10-26 14:22:31 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2015-10-26 14:22:31 -0700 |
commit | a89e87c72e6a351c6d1c74ae59a2d7010578d26c (patch) | |
tree | 46b3774ade40f99d1b2d1645b8e619ff5b6dc1ce /indra/newview/llchannelmanager.cpp | |
parent | 16cd296e30e95fbacefff4e291fbdd6fbf0c2c43 (diff) | |
parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) |
Merge with head of viewer release (3.8.6 changes)
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")); |