summaryrefslogtreecommitdiff
path: root/indra/newview/llchannelmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llchannelmanager.cpp')
-rw-r--r--indra/newview/llchannelmanager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp
index f66a9865fc..454991ab83 100644
--- a/indra/newview/llchannelmanager.cpp
+++ b/indra/newview/llchannelmanager.cpp
@@ -148,7 +148,7 @@ void LLChannelManager::onLoginCompleted()
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"));
+ mStartUpChannel->createStartUpToast(away_notifications, (F32)gSavedSettings.getS32("StartUpToastLifeTime"));
}
}
@@ -161,7 +161,7 @@ void LLChannelManager::onStartUpToastClose()
{
if(mStartUpChannel)
{
- mStartUpChannel->setVisible(FALSE);
+ mStartUpChannel->setVisible(false);
mStartUpChannel->closeStartUpToast();
removeChannelByID(STARTUP_CHANNEL_UUID);
mStartUpChannel = NULL;
@@ -261,8 +261,8 @@ LLNotificationsUI::LLScreenChannel* LLChannelManager::getNotificationScreenChann
if (channel == NULL)
{
- LL_WARNS() << "Can't find screen channel by Notification Channel UUID" << LL_ENDL;
- llassert(!"Can't find screen channel by Notification Channel UUID");
+ LL_WARNS() << "Can't find screen channel by NotificationChannelUUID" << LL_ENDL;
+ llassert(!"Can't find screen channel by NotificationChannelUUID");
}
return channel;